refactor

Signed-off-by: Peter Rong <[email protected]>

Author: DataCorrupted

lld/MachO/BPSectionOrderer.cpp

@@ -64,17 +64,17 @@ getRelocHash(const Reloc &reloc,
 static uint64_t getUnwindInfoEncodingHash(const InputSection *isec) {
   for (Symbol *sym : isec->symbols) {
     if (auto *d = dyn_cast_or_null<Defined>(sym)) {
-      if (auto *ue = d->unwindEntry()) {
-        CompactUnwindEntry cu;
-        cu.relocateOneCompactUnwindEntry(d);
-        if (cu.lsda)
-          return xxHash64("HAS LSDA");
-        StringRef name = cu.personality ? cu.personality->getName().empty()
-                                              ? "<unnamed>"
-                                              : cu.personality->getName()
-                                        : "<none>";
-        return xxHash64((name + ";" + Twine::utohexstr(cu.encoding)).str());
-      }
+      if (!d->unwindEntry())
+        continue;
+      CompactUnwindEntry cu;
+      cu.relocateOneCompactUnwindEntry(d);
+      if (cu.lsda)
+        return xxHash64("HAS LSDA");
+      StringRef name = (cu.personality == nullptr) ? "<none>"
+                       : cu.personality->getName().empty()
+                           ? "<unnamed>"
+                           : cu.personality->getName();
+      return xxHash64((name + ";" + Twine::utohexstr(cu.encoding)).str());
     }
   }
   return 0;

lld/MachO/UnwindInfoSection.cpp

@@ -111,10 +111,12 @@ CREATE_LAYOUT_CLASS(CompactUnwind, FOR_EACH_CU_FIELD);
 
 void lld::macho::CompactUnwindEntry::relocateOneCompactUnwindEntry(
     const Defined *d) {
+  functionAddress = d->getVA();
+
   ConcatInputSection *unwindEntry = d->unwindEntry();
-  assert(unwindEntry);
+  if (!unwindEntry)
+    return;
 
-  functionAddress = d->getVA();
   // If we have DWARF unwind info, create a slimmed-down CU entry that points
   // to it.
   if (unwindEntry->getName() == section_names::ehFrame) {
@@ -126,12 +128,11 @@ void lld::macho::CompactUnwindEntry::relocateOneCompactUnwindEntry(
     // would instead encode the largest possible offset to a valid CFI record,
     // but since we don't keep track of that, just encode zero -- the start of
     // the section is always the start of a CFI record.
-    uint64_t dwarfOffsetHint =
-        d->unwindEntry()->outSecOff <= DWARF_SECTION_OFFSET
-            ? d->unwindEntry()->outSecOff
-            : 0;
+    uint64_t dwarfOffsetHint = unwindEntry->outSecOff <= DWARF_SECTION_OFFSET
+                                   ? unwindEntry->outSecOff
+                                   : 0;
     encoding = target->modeDwarfEncoding | dwarfOffsetHint;
-    const FDE &fde = cast<ObjFile>(d->getFile())->fdes[d->unwindEntry()];
+    const FDE &fde = cast<ObjFile>(d->getFile())->fdes[unwindEntry];
     functionLength = fde.funcLength;
     // Omit the DWARF personality from compact-unwind entry so that we
     // don't need to encode it.
@@ -388,13 +389,7 @@ Symbol *UnwindInfoSectionImpl::canonicalizePersonality(Symbol *personality) {
 void UnwindInfoSectionImpl::relocateCompactUnwind(
     std::vector<CompactUnwindEntry> &cuEntries) {
   parallelFor(0, symbolsVec.size(), [&](size_t i) {
-    CompactUnwindEntry &cu = cuEntries[i];
-    const Defined *d = symbolsVec[i].second;
-    cu.functionAddress = d->getVA();
-    if (!d->unwindEntry())
-      return;
-
-    cu.relocateOneCompactUnwindEntry(d);
+    cuEntries[i].relocateOneCompactUnwindEntry(symbolsVec[i].second);
   });
 }