Re-land [lld-macho][nfc] Don't use stubsHelperIndex in ICF hash

Previous attempt was commit 112135e and reverted in d86d431.
llvm · Mar 7, 2022 · 0405920 · 0405920
1 parent 7643633
commit 0405920
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lld/MachO/ICF.cpp b/lld/MachO/ICF.cpp
@@ -278,9 +278,7 @@ void ICF::run() {
       uint32_t hash = isec->icfEqClass[icfPass % 2];
       for (const Reloc &r : isec->relocs) {
         if (auto *sym = r.referent.dyn_cast<Symbol *>()) {
-          if (auto *dylibSym = dyn_cast<DylibSymbol>(sym))
-            hash += dylibSym->stubsHelperIndex;
-          else if (auto *defined = dyn_cast<Defined>(sym)) {
+          if (auto *defined = dyn_cast<Defined>(sym)) {
             if (defined->isec) {
               if (auto referentIsec =
                       dyn_cast<ConcatInputSection>(defined->isec))
@@ -291,8 +289,10 @@ void ICF::run() {
             } else {
               hash += defined->value;
             }
-          } else if (!isa<Undefined>(sym)) // ICF runs before Undefined diags.
-            llvm_unreachable("foldIdenticalSections symbol kind");
+          } else {
+            // ICF runs before Undefined diags
+            assert(isa<Undefined>(sym) || isa<DylibSymbol>(sym));
+          }
         }
       }
       // Set MSB to 1 to avoid collisions with non-hashed classes.