[PATCH] D130288: [lld-macho] Fix LOH parsing segfault

[Jez Ng via Phabricator via llvm-commits]

int3 updated this revision to Diff 446559.
int3 added a comment.

more detailed comment


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D130288/new/

https://reviews.llvm.org/D130288

Files:
  lld/MachO/InputFiles.cpp
  lld/test/MachO/loh-parsing.s


Index: lld/test/MachO/loh-parsing.s
===================================================================
--- /dev/null
+++ lld/test/MachO/loh-parsing.s
@@ -0,0 +1,24 @@
+# REQUIRES: aarch64
+
+# RUN: llvm-mc -filetype=obj -triple=arm64-apple-darwin %s -o %t.o
+# RUN: %lld -arch arm64 -dylib %t.o -o /dev/null
+
+## Check that we parse the LOH / match it to its referent sections correctly,
+## even when there are other subsections that don't get parsed as regular
+## sections. (We would previously segfault.)
+## __debug_info is one such section that gets special-case handling.
+
+.text
+_foo:
+
+.section __DWARF,__debug_info,regular,debug
+
+## __StaticInit occurs after __debug_info in the input object file, so the
+## LOH-matching code will have to "walk" past __debug_info while searching for
+## __StaticInit. Thus this verifies that we can skip past __debug_info
+## correctly.
+.section __TEXT,__StaticInit
+L1:  adrp  x1, _foo at PAGE
+L2:  ldr   x1, [x1, _foo at PAGEOFF]
+
+.loh AdrpLdr L1, L2
Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ lld/MachO/InputFiles.cpp
@@ -563,7 +563,7 @@
     if (section == sections.end())
       return;
     ++subsection;
-    if (subsection == (*section)->subsections.end()) {
+    while (subsection == (*section)->subsections.end()) {
       ++section;
       if (section == sections.end())
         return;
@@ -585,6 +585,7 @@
         if (section == sections.end())
           break;
         updateAddr();
+        assert(hintStart->offset0 >= subsectionBase);
       }
     }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D130288.446559.patch
Type: text/x-patch
Size: 1613 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220721/1c20bd1d/attachment.bin>