Simplify code and add missing wri/rdi

NixOS · Feb 19, 2023 · b890456 · b890456
1 parent 622712c
commit b890456
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -1912,7 +1912,7 @@ void ElfFile<ElfFileParamNames>::rebuildGnuHashTable(const char* strTab, span<El
 
     // The hash table includes only a subset of dynsyms
     auto firstSymIdx = rdi(ght.m_hdr.symndx);
-    auto symsToInsert = span(dynsyms.begin() + firstSymIdx, dynsyms.end());
+    dynsyms = span(dynsyms.begin() + firstSymIdx, dynsyms.end());
 
     // Only use the range of symbol versions that will be changed
     auto versyms = tryGetSectionSpan<Elf_Versym>(".gnu.version");
@@ -1925,10 +1925,10 @@ void ElfFile<ElfFileParamNames>::rebuildGnuHashTable(const char* strTab, span<El
     };
 
     std::vector<Entry> entries;
-    entries.reserve(symsToInsert.size());
+    entries.reserve(dynsyms.size());
 
     uint32_t pos = 0; // Track the original position of the symbol in the table
-    for (auto& sym : symsToInsert)
+    for (auto& sym : dynsyms)
     {
         Entry e;
         e.hash = gnuHash(strTab + rdi(sym.st_name));
@@ -1956,7 +1956,7 @@ void ElfFile<ElfFileParamNames>::rebuildGnuHashTable(const char* strTab, span<El
             dst[old2new[i]] = tmp[i];
     };
 
-    reorderSpan(symsToInsert, old2new);
+    reorderSpan(dynsyms, old2new);
     if (versyms)
         reorderSpan(versyms, old2new);
 
@@ -1970,9 +1970,8 @@ void ElfFile<ElfFileParamNames>::rebuildGnuHashTable(const char* strTab, span<El
             if (oldSymIdx >= firstSymIdx)
             {
                 auto newSymIdx = old2new[oldSymIdx - firstSymIdx] + firstSymIdx;
-                if (newSymIdx != oldSymIdx) {
+                if (newSymIdx != oldSymIdx)
                     wri(r.r_info, rel_setSymId(info, newSymIdx));
-                }
             }
         }
     };
@@ -1995,7 +1994,7 @@ void ElfFile<ElfFileParamNames>::rebuildGnuHashTable(const char* strTab, span<El
         size_t idx = (h / ElfClass) % ght.m_bloomFilters.size();
         auto val = rdi(ght.m_bloomFilters[idx]);
         val |= uint64_t(1) << (h % ElfClass);
-        val |= uint64_t(1) << ((h >> ght.m_hdr.shift2) % ElfClass);
+        val |= uint64_t(1) << ((h >> rdi(ght.m_hdr.shift2)) % ElfClass);
         wri(ght.m_bloomFilters[idx], val);
     }
 
@@ -2059,8 +2058,8 @@ void ElfFile<ElfFileParamNames>::rebuildHashTable(const char* strTab, span<Elf_S
         auto name = strTab + rdi(sym.st_name);
         uint32_t i = &sym - dynsyms.begin();
         uint32_t hash = sysvHash(name) % ht.m_buckets.size();
-        ht.m_chain[i] = ht.m_buckets[hash];
-        ht.m_buckets[hash] = i;
+        wri(ht.m_chain[i], rdi(ht.m_buckets[hash]));
+        wri(ht.m_buckets[hash], i);
     }
 }