[llvm] [DWARFLinker] Add assembly-label range handling to parallel linker (PR #195366)

Jonas Devlieghere via llvm-commits llvm-commits at lists.llvm.org
Mon May 4 09:20:25 PDT 2026


https://github.com/JDevlieghere updated https://github.com/llvm/llvm-project/pull/195366

>From 1a264eee3989485a94e355d04139ee5b2d3a49b2 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas at devlieghere.com>
Date: Fri, 1 May 2026 14:52:31 -0700
Subject: [PATCH 1/2] [DWARFLinker] Add assembly-label range handling to
 parallel linker

Assembly CUs typically have DW_TAG_label entries instead of subprograms,
so the parallel linker's line-table filter saw no function ranges and
dropped every row. Mirror the classic linker: for labels in Mips_Assembler
or Assembly CUs, look up an assembly range via getAssemblyRangeForAddress
and call addFunctionRange before falling back to addLabelLowPc.
---
 .../DWARFLinker/Parallel/DependencyTracker.cpp   | 16 ++++++++++++++++
 llvm/test/tools/dsymutil/asm-line-tables.test    |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp b/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
index 5e30d9a8b6690..c6e501f463e6e 100644
--- a/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
+++ b/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
@@ -816,6 +816,22 @@ bool DependencyTracker::isLiveSubprogramEntry(const UnitEntryPairTy &Entry) {
               .value_or(UINT64_MAX) <= LowPc)
         return false;
 
+      // For assembly-language CUs there are typically no DW_TAG_subprogram
+      // DIEs, so labels are the only addresses we see. Fall back to the
+      // assembly-range lookup to recover a function range for the line-table
+      // filter; otherwise the output line table would be empty.
+      uint16_t Language = dwarf::toUnsigned(
+          Entry.CU->getOrigUnit().getUnitDIE().find(dwarf::DW_AT_language), 0);
+      if (Language == dwarf::DW_LANG_Mips_Assembler ||
+          Language == dwarf::DW_LANG_Assembly) {
+        if (auto Range = Entry.CU->getContaingFile()
+                             .Addresses->getAssemblyRangeForAddress(*LowPc)) {
+          Entry.CU->addFunctionRange(Range->LowPC, Range->HighPC,
+                                     *RelocAdjustment);
+          return true;
+        }
+      }
+
       Entry.CU->addLabelLowPc(*LowPc, *RelocAdjustment);
     }
   } else
diff --git a/llvm/test/tools/dsymutil/asm-line-tables.test b/llvm/test/tools/dsymutil/asm-line-tables.test
index d0000426b52c5..e57ea7e9bca74 100644
--- a/llvm/test/tools/dsymutil/asm-line-tables.test
+++ b/llvm/test/tools/dsymutil/asm-line-tables.test
@@ -8,7 +8,8 @@ REQUIRES: aarch64-registered-target
 RUN: dsymutil --linker classic -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
 RUN: llvm-dwarfdump --debug-line %t.dSYM | FileCheck %s
 
-## FIXME: Support --linker parallel
+RUN: dsymutil --linker parallel -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
+RUN: llvm-dwarfdump --debug-line %t.dSYM | FileCheck %s
 
 CHECK:      0x00000001000002e8      5      0      0   0             0       0  is_stmt
 CHECK-NEXT: 0x00000001000002ec      9      0      0   0             0       0  is_stmt

>From 44808c35260f903aec235e4456a0f96eb7cfd833 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas at devlieghere.com>
Date: Mon, 4 May 2026 09:20:07 -0700
Subject: [PATCH 2/2] Fix verbose output

---
 llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp |  7 +++++++
 llvm/test/tools/dsymutil/asm-line-tables.test       | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp b/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
index c6e501f463e6e..ba819be3632c0 100644
--- a/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
+++ b/llvm/lib/DWARFLinker/Parallel/DependencyTracker.cpp
@@ -828,6 +828,13 @@ bool DependencyTracker::isLiveSubprogramEntry(const UnitEntryPairTy &Entry) {
                              .Addresses->getAssemblyRangeForAddress(*LowPc)) {
           Entry.CU->addFunctionRange(Range->LowPC, Range->HighPC,
                                      *RelocAdjustment);
+          if (Entry.CU->getGlobalData().getOptions().Verbose) {
+            outs() << "Keeping subprogram DIE:";
+            DIDumpOptions DumpOpts;
+            DumpOpts.ChildRecurseDepth = 0;
+            DumpOpts.Verbose = Entry.CU->getGlobalData().getOptions().Verbose;
+            DIE.dump(outs(), 8 /* Indent */, DumpOpts);
+          }
           return true;
         }
       }
diff --git a/llvm/test/tools/dsymutil/asm-line-tables.test b/llvm/test/tools/dsymutil/asm-line-tables.test
index e57ea7e9bca74..c77865dea78ef 100644
--- a/llvm/test/tools/dsymutil/asm-line-tables.test
+++ b/llvm/test/tools/dsymutil/asm-line-tables.test
@@ -5,13 +5,20 @@ $ clang -target arm64-apple-macos26 asm-line-tables.s -o asm-line-tables.o -c -g
 $ clang -target arm64-apple-macos26 -o asm-line-tables.arm64 asm-line-tables.o -nodefaultlibs -nostdlib -static -Wl,-oso_prefix,$PWD
 
 REQUIRES: aarch64-registered-target
-RUN: dsymutil --linker classic -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
+RUN: dsymutil --linker classic --verbose -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM | FileCheck %s --check-prefix=VERBOSE
 RUN: llvm-dwarfdump --debug-line %t.dSYM | FileCheck %s
 
-RUN: dsymutil --linker parallel -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM
+RUN: dsymutil --linker parallel --verbose -oso-prepend-path %p/Inputs/ %p/Inputs/private/tmp/asm/asm-line-tables.arm64 -o %t.dSYM | FileCheck %s --check-prefix=VERBOSE
 RUN: llvm-dwarfdump --debug-line %t.dSYM | FileCheck %s
 
 CHECK:      0x00000001000002e8      5      0      0   0             0       0  is_stmt
 CHECK-NEXT: 0x00000001000002ec      9      0      0   0             0       0  is_stmt
 CHECK-NEXT: 0x00000001000002f0     10      0      0   0             0       0  is_stmt
 CHECK-NEXT: 0x00000001000002f4     10      0      0   0             0       0  is_stmt end_sequence
+
+VERBOSE:      Keeping subprogram DIE:
+VERBOSE-NEXT: DW_TAG_label
+VERBOSE:      DW_AT_name {{.*}}("foo")
+VERBOSE:      Keeping subprogram DIE:
+VERBOSE-NEXT: DW_TAG_label
+VERBOSE:      DW_AT_name {{.*}}("start")



More information about the llvm-commits mailing list