[llvm] [BOLT] fix race condition in multi-threaded DWO type unit processing (PR #197359)

via llvm-commits llvm-commits at lists.llvm.org
Tue Jun 2 19:49:34 PDT 2026


https://github.com/Thrrreeee updated https://github.com/llvm/llvm-project/pull/197359

>From 04b1467aa8b02fb2f7d74c524eb220132f5abf1a Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Fri, 22 May 2026 17:38:03 +0800
Subject: [PATCH 1/7] [BOLT] Fix race condition in multi-threaded DWP type unit
 processing

---
 bolt/include/bolt/Core/BinaryContext.h        |  7 +++++
 bolt/include/bolt/Core/DIEBuilder.h           |  8 ++++++
 bolt/lib/Core/DIEBuilder.cpp                  | 16 ++++++++++++
 bolt/lib/Rewrite/RewriteInstance.cpp          |  8 +++---
 .../X86/dwarf5-df-types-dup-dwp-input.test    |  2 +-
 bolt/test/X86/dwarf5-dwp-tsan-data-race.test  | 26 +++++++++++++++++++
 6 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 bolt/test/X86/dwarf5-dwp-tsan-data-race.test

diff --git a/bolt/include/bolt/Core/BinaryContext.h b/bolt/include/bolt/Core/BinaryContext.h
index c1e9c4e287bbc..85aa214cfb331 100644
--- a/bolt/include/bolt/Core/BinaryContext.h
+++ b/bolt/include/bolt/Core/BinaryContext.h
@@ -48,6 +48,7 @@
 #include <functional>
 #include <list>
 #include <map>
+#include <mutex>
 #include <optional>
 #include <set>
 #include <string>
@@ -284,12 +285,18 @@ class BinaryContext {
   /// Internal helper for removing section name from a lookup table.
   void deregisterSectionName(const BinarySection &Section);
 
+  /// Mutex used for parallel processing of DWP type units.
+  mutable std::recursive_mutex DWPUnitsMutex;
+
 public:
   static Expected<std::unique_ptr<BinaryContext>> createBinaryContext(
       Triple TheTriple, std::shared_ptr<orc::SymbolStringPool> SSP,
       StringRef InputFileName, SubtargetFeatures *Features, bool IsPIC,
       std::unique_ptr<DWARFContext> DwCtx, JournalingStreams Logger);
 
+  /// Returns the mutex guarding concurrent access to DWP units.
+  std::recursive_mutex &getUnitsMutex() { return DWPUnitsMutex; }
+
   /// Superset of compiler units that will contain overwritten code that needs
   /// new debug info. In a few cases, functions may end up not being
   /// overwritten, but it is okay to re-generate debug info for them.
diff --git a/bolt/include/bolt/Core/DIEBuilder.h b/bolt/include/bolt/Core/DIEBuilder.h
index 21b1fbc486cd9..f094c9b24a17a 100644
--- a/bolt/include/bolt/Core/DIEBuilder.h
+++ b/bolt/include/bolt/Core/DIEBuilder.h
@@ -217,6 +217,14 @@ class DIEBuilder {
   /// Returns true if DWARFUnit is registered successfully.
   bool registerUnit(DWARFUnit &DU, bool NeedSort);
 
+  /// Builds type units without extra synchronization.
+  void buildTypeUnitsImpl(DebugStrOffsetsWriter *StrOffsetWriter,
+                          const bool Init);
+
+  /// Serializes type-unit construction for DWP-backed split DWARF contexts.
+  void buildTypeUnitsThreadSafe(DebugStrOffsetsWriter *StrOffsetWriter,
+                                const bool Init);
+
   /// \return the unique ID of \p U if it exists.
   std::optional<uint32_t> getUnitId(const DWARFUnit &DU);
 
diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index dc9102191353a..7d4480184e7b7 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -238,6 +238,22 @@ static unsigned int getCUNum(DWARFContext *DwarfContext, bool IsDWO) {
 
 void DIEBuilder::buildTypeUnits(DebugStrOffsetsWriter *StrOffsetWriter,
                                 const bool Init) {
+  if (isDWO() && DwarfContext && DwarfContext->isDWP()) {
+    buildTypeUnitsThreadSafe(StrOffsetWriter, Init);
+    return;
+  }
+
+  buildTypeUnitsImpl(StrOffsetWriter, Init);
+}
+
+void DIEBuilder::buildTypeUnitsThreadSafe(
+    DebugStrOffsetsWriter *StrOffsetWriter, const bool Init) {
+  std::unique_lock<std::recursive_mutex> LockGuard(BC.getUnitsMutex());
+  buildTypeUnitsImpl(StrOffsetWriter, Init);
+}
+
+void DIEBuilder::buildTypeUnitsImpl(DebugStrOffsetsWriter *StrOffsetWriter,
+                                    const bool Init) {
   if (Init)
     BuilderState.reset(new State());
 
diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp
index 4a2d83cbf8706..ede70820067e3 100644
--- a/bolt/lib/Rewrite/RewriteInstance.cpp
+++ b/bolt/lib/Rewrite/RewriteInstance.cpp
@@ -441,10 +441,10 @@ RewriteInstance::RewriteInstance(ELFObjectFileBase *File, const int Argc,
   auto BCOrErr = BinaryContext::createBinaryContext(
       TheTriple, std::make_shared<orc::SymbolStringPool>(), File->getFileName(),
       Features.get(), IsPIC,
-      DWARFContext::create(*File, DWARFContext::ProcessDebugRelocations::Ignore,
-                           nullptr, opts::DWPPathName,
-                           WithColor::defaultErrorHandler,
-                           WithColor::defaultWarningHandler),
+      DWARFContext::create(
+          *File, DWARFContext::ProcessDebugRelocations::Ignore, nullptr,
+          opts::DWPPathName, WithColor::defaultErrorHandler,
+          WithColor::defaultWarningHandler, !opts::DWPPathName.empty()),
       JournalingStreams{Stdout, Stderr});
   if (Error E = BCOrErr.takeError()) {
     Err = std::move(E);
diff --git a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
index 754f05dc96328..923d13dafdaf4 100644
--- a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
+++ b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
@@ -7,7 +7,7 @@
 ; RUN: -split-dwarf-file=helper.dwo -o helper.o
 ; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
 ; RUN: llvm-dwp -e main.exe -o main.exe.dwp
-; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections  --debug-thread-count=4 --cu-processing-batch-size=4
 ; RUN: llvm-dwarfdump --debug-info -r 0 main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-MAIN %s
 ; RUN: llvm-dwarfdump --debug-info -r 0 helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-HELPER %s
 
diff --git a/bolt/test/X86/dwarf5-dwp-tsan-data-race.test b/bolt/test/X86/dwarf5-dwp-tsan-data-race.test
new file mode 100644
index 0000000000000..f961cc0b1abf2
--- /dev/null
+++ b/bolt/test/X86/dwarf5-dwp-tsan-data-race.test
@@ -0,0 +1,26 @@
+; RUN: rm -rf %t
+; RUN: mkdir %t
+; RUN: cd %t
+; RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-df-types-dup-main.s \
+; RUN:   -split-dwarf-file=main.dwo -o main.o
+; RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-df-types-dup-helper.s \
+; RUN:   -split-dwarf-file=helper.dwo -o helper.o
+; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
+; RUN: llvm-dwp -e main.exe -o main.exe.dwp
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections \
+; RUN:   --thread-count=4 --cu-processing-batch-size=4 --dwp=main.exe.dwp 2>&1 | FileCheck %s
+; RUN: llvm-dwarfdump --debug-info -r 0 main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-MAIN %s
+; RUN: llvm-dwarfdump --debug-info -r 0 helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-HELPER %s
+
+;; Tests that BOLT correctly handles DWARF5 DWP file as input in a
+;; multi-threaded configuration without triggering ThreadSanitizer (TSan)
+;; data race reports. The binary must be built with TSan instrumentation
+;; (i.e. LLVM_USE_SANITIZER=Thread) for this test to be effective.
+;; REQUIRES: tsan
+
+; CHECK-NOT: ThreadSanitizer: data race
+; CHECK-NOT: ThreadSanitizer: reported
+; CHECK-NOT: WARNING: ThreadSanitizer
+
+; BOLT-DWO-DWO-MAIN: DW_TAG_compile_unit
+; BOLT-DWO-DWO-HELPER: DW_TAG_compile_unit
\ No newline at end of file

>From 5cd26b30fa99d40379bf5c20181b51c65f2bf1ee Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Thu, 28 May 2026 12:47:56 +0800
Subject: [PATCH 2/7] fix some code

---
 bolt/lib/Core/DIEBuilder.cpp                     | 2 +-
 bolt/test/X86/dwarf5-df-types-dup-dwp-input.test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index 7d4480184e7b7..6381415a56b8f 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -238,7 +238,7 @@ static unsigned int getCUNum(DWARFContext *DwarfContext, bool IsDWO) {
 
 void DIEBuilder::buildTypeUnits(DebugStrOffsetsWriter *StrOffsetWriter,
                                 const bool Init) {
-  if (isDWO() && DwarfContext && DwarfContext->isDWP()) {
+  if (DwarfContext->isDWP()) {
     buildTypeUnitsThreadSafe(StrOffsetWriter, Init);
     return;
   }
diff --git a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
index 923d13dafdaf4..754f05dc96328 100644
--- a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
+++ b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
@@ -7,7 +7,7 @@
 ; RUN: -split-dwarf-file=helper.dwo -o helper.o
 ; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
 ; RUN: llvm-dwp -e main.exe -o main.exe.dwp
-; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections  --debug-thread-count=4 --cu-processing-batch-size=4
+; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
 ; RUN: llvm-dwarfdump --debug-info -r 0 main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-MAIN %s
 ; RUN: llvm-dwarfdump --debug-info -r 0 helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-HELPER %s
 

>From 4ceed8ccc3ccf4a9d387c8411719fa5347b07d0e Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Fri, 29 May 2026 20:00:39 +0800
Subject: [PATCH 3/7] [BOLT] Fix DWP debug info update incorrectly including
 all TypeUnits in each DWO output

---
 bolt/include/bolt/Core/DIEBuilder.h           |  9 +-
 bolt/lib/Core/DIEBuilder.cpp                  | 90 +++++++++++++++----
 bolt/lib/Rewrite/DWARFRewriter.cpp            |  6 +-
 bolt/lib/Rewrite/RewriteInstance.cpp          |  2 +-
 .../X86/dwarf5-df-types-dup-dwp-input.test    |  7 +-
 5 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/bolt/include/bolt/Core/DIEBuilder.h b/bolt/include/bolt/Core/DIEBuilder.h
index f094c9b24a17a..628edfc12fdaf 100644
--- a/bolt/include/bolt/Core/DIEBuilder.h
+++ b/bolt/include/bolt/Core/DIEBuilder.h
@@ -217,13 +217,8 @@ class DIEBuilder {
   /// Returns true if DWARFUnit is registered successfully.
   bool registerUnit(DWARFUnit &DU, bool NeedSort);
 
-  /// Builds type units without extra synchronization.
-  void buildTypeUnitsImpl(DebugStrOffsetsWriter *StrOffsetWriter,
-                          const bool Init);
-
-  /// Serializes type-unit construction for DWP-backed split DWARF contexts.
-  void buildTypeUnitsThreadSafe(DebugStrOffsetsWriter *StrOffsetWriter,
-                                const bool Init);
+  /// Builds type units needed in the DWO.
+  void buildDWPTypeUnitsForUnit(DWARFUnit &U);
 
   /// \return the unique ID of \p U if it exists.
   std::optional<uint32_t> getUnitId(const DWARFUnit &DU);
diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index 6381415a56b8f..b15b69504e2e1 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -238,22 +238,6 @@ static unsigned int getCUNum(DWARFContext *DwarfContext, bool IsDWO) {
 
 void DIEBuilder::buildTypeUnits(DebugStrOffsetsWriter *StrOffsetWriter,
                                 const bool Init) {
-  if (DwarfContext->isDWP()) {
-    buildTypeUnitsThreadSafe(StrOffsetWriter, Init);
-    return;
-  }
-
-  buildTypeUnitsImpl(StrOffsetWriter, Init);
-}
-
-void DIEBuilder::buildTypeUnitsThreadSafe(
-    DebugStrOffsetsWriter *StrOffsetWriter, const bool Init) {
-  std::unique_lock<std::recursive_mutex> LockGuard(BC.getUnitsMutex());
-  buildTypeUnitsImpl(StrOffsetWriter, Init);
-}
-
-void DIEBuilder::buildTypeUnitsImpl(DebugStrOffsetsWriter *StrOffsetWriter,
-                                    const bool Init) {
   if (Init)
     BuilderState.reset(new State());
 
@@ -299,6 +283,73 @@ void DIEBuilder::buildTypeUnitsImpl(DebugStrOffsetsWriter *StrOffsetWriter,
   }
 }
 
+static void collectReferencedTypeSignatures(DWARFDie Die,
+                                            DenseSet<uint64_t> &ProcessedTU,
+                                            SmallVectorImpl<uint64_t> &TUlist) {
+  SmallVector<DWARFDie, 8> DIElist;
+  DIElist.push_back(Die);
+
+  while (!DIElist.empty()) {
+    DWARFDie Current = DIElist.pop_back_val();
+    if (!Current)
+      continue;
+
+    for (const DWARFAttribute &Attr : Current.attributes()) {
+      if (Attr.Value.getForm() != dwarf::DW_FORM_ref_sig8)
+        continue;
+      if (const std::optional<uint64_t> Signature =
+              Attr.Value.getAsSignatureReference())
+        if (ProcessedTU.insert(*Signature).second)
+          TUlist.push_back(*Signature);
+    }
+
+    for (DWARFDie Child : Current.children())
+      DIElist.push_back(Child);
+  }
+}
+
+void DIEBuilder::buildDWPTypeUnitsForUnit(DWARFUnit &U) {
+  // Avoid processing the same type unit multiple times.
+  DenseSet<uint64_t> ProcessedTU;
+  SmallVector<uint64_t, 8> TUlist;
+  // Collecting signatures of type units referenced by this unit.
+  collectReferencedTypeSignatures(U.getUnitDIE(), ProcessedTU, TUlist);
+
+  // addressing type units referenced.
+  for (unsigned I = 0; I != TUlist.size(); ++I) {
+    const uint64_t Signature = TUlist[I];
+    DWARFTypeUnit *TU = DwarfContext->getTypeUnitForHash(Signature, true);
+    if (!TU)
+      continue;
+
+    getState().Type = TU->getVersion() < 5 ? ProcessingType::DWARF4TUs
+                                           : ProcessingType::DWARF5TUs;
+    if (!registerUnit(*TU, false))
+      continue;
+
+    const std::optional<uint32_t> UnitId = getUnitId(*TU);
+    if (!UnitId || getState().CloneUnitCtxMap[*UnitId].IsConstructed)
+      continue;
+
+    collectReferencedTypeSignatures(TU->getUnitDIE(), ProcessedTU, TUlist);
+  }
+
+  // Ensure deterministic order of processing type units
+  auto SortByOffset = [](const DWARFUnit *A, const DWARFUnit *B) {
+    return A->getOffset() < B->getOffset();
+  };
+  llvm::sort(getState().DWARF4TUVector, SortByOffset);
+  llvm::sort(getState().DWARF5TUVector, SortByOffset);
+
+  getState().Type = ProcessingType::DWARF4TUs;
+  for (DWARFUnit *TU : getState().DWARF4TUVector)
+    constructFromUnit(*TU);
+
+  getState().Type = ProcessingType::DWARF5TUs;
+  for (DWARFUnit *TU : getState().DWARF5TUVector)
+    constructFromUnit(*TU);
+}
+
 void DIEBuilder::buildCompileUnits(const bool Init) {
   if (Init)
     BuilderState.reset(new State());
@@ -344,7 +395,12 @@ void DIEBuilder::buildCompileUnits(const std::vector<DWARFUnit *> &CUs) {
 void DIEBuilder::buildDWOUnit(DWARFUnit &U) {
   BuilderState.release();
   BuilderState = std::make_unique<State>();
-  buildTypeUnits(nullptr, false);
+  if (DwarfContext->isDWP()) {
+    std::unique_lock<std::recursive_mutex> LockGuard(BC.getUnitsMutex());
+    buildDWPTypeUnitsForUnit(U);
+  } else {
+    buildTypeUnits(nullptr, false);
+  }
   getState().Type = ProcessingType::CUs;
   registerUnit(U, false);
   constructFromUnit(U);
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 1af2d31f99bee..076d2e3d29cce 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -496,12 +496,8 @@ static void emitDWOBuilder(const std::string &DWOName,
       createDIEStreamer(*TheTriple, *ObjOS, "DwoStreamerInitAug2",
                         DWODIEBuilder, GDBIndexSection);
   if (SplitCU.getContext().getMaxDWOVersion() >= 5) {
-    for (std::unique_ptr<llvm::DWARFUnit> &CU :
-         SplitCU.getContext().dwo_info_section_units()) {
-      if (!CU->isTypeUnit())
-        continue;
+    for (DWARFUnit *CU : DWODIEBuilder.getDWARF5TUVector())
       emitUnit(DWODIEBuilder, *Streamer, *CU);
-    }
     emitUnit(DWODIEBuilder, *Streamer, SplitCU);
   } else {
     emitUnit(DWODIEBuilder, *Streamer, SplitCU);
diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp
index ede70820067e3..1c3ed0b3c152a 100644
--- a/bolt/lib/Rewrite/RewriteInstance.cpp
+++ b/bolt/lib/Rewrite/RewriteInstance.cpp
@@ -444,7 +444,7 @@ RewriteInstance::RewriteInstance(ELFObjectFileBase *File, const int Argc,
       DWARFContext::create(
           *File, DWARFContext::ProcessDebugRelocations::Ignore, nullptr,
           opts::DWPPathName, WithColor::defaultErrorHandler,
-          WithColor::defaultWarningHandler, !opts::DWPPathName.empty()),
+          WithColor::defaultWarningHandler, true),
       JournalingStreams{Stdout, Stderr});
   if (Error E = BCOrErr.takeError()) {
     Err = std::move(E);
diff --git a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
index 754f05dc96328..68675f4d4f309 100644
--- a/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
+++ b/bolt/test/X86/dwarf5-df-types-dup-dwp-input.test
@@ -11,17 +11,18 @@
 ; RUN: llvm-dwarfdump --debug-info -r 0 main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-MAIN %s
 ; RUN: llvm-dwarfdump --debug-info -r 0 helper.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-DWO-HELPER %s
 
-;; Tests that BOLT correctly handles DWARF5 DWP file as input. Output has correct CU, and all the type units are written out.
+;; Tests that BOLT correctly handles DWARF5 DWP file as input. Output has the correct CU,
+;; and only type units referenced by that CU are written out.
 
 ; BOLT-DWO-DWO-MAIN: debug_info.dwo
 ; BOLT-DWO-DWO-MAIN-NEXT: type_signature = 0x49dc260088be7e56
 ; BOLT-DWO-DWO-MAIN: type_signature = 0x104ec427d2ebea6f
-; BOLT-DWO-DWO-MAIN: type_signature = 0xca1e65a66d92b970
+; BOLT-DWO-DWO-MAIN-NOT: type_signature = 0xca1e65a66d92b970
 ; BOLT-DWO-DWO-MAIN: Compile Unit
 ; BOLT-DWO-DWO-MAIN-SAME: DWO_id = 0x52bda211bf6d26b7
 ; BOLT-DWO-DWO-MAIN-NOT: Compile Unit
 ; BOLT-DWO-DWO-HELPER: debug_info.dwo
-; BOLT-DWO-DWO-HELPER-NEXT: type_signature = 0x49dc260088be7e56
+; BOLT-DWO-DWO-HELPER-NOT: type_signature = 0x49dc260088be7e56
 ; BOLT-DWO-DWO-HELPER: type_signature = 0x104ec427d2ebea6f
 ; BOLT-DWO-DWO-HELPER: type_signature = 0xca1e65a66d92b970
 ; BOLT-DWO-DWO-HELPER: Compile Unit

>From 6804e6cee38b4b1b0182261237915b883dd16dab Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Fri, 29 May 2026 20:04:14 +0800
Subject: [PATCH 4/7] fix code format

---
 bolt/lib/Rewrite/RewriteInstance.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp
index 1c3ed0b3c152a..527770d48b13a 100644
--- a/bolt/lib/Rewrite/RewriteInstance.cpp
+++ b/bolt/lib/Rewrite/RewriteInstance.cpp
@@ -441,10 +441,10 @@ RewriteInstance::RewriteInstance(ELFObjectFileBase *File, const int Argc,
   auto BCOrErr = BinaryContext::createBinaryContext(
       TheTriple, std::make_shared<orc::SymbolStringPool>(), File->getFileName(),
       Features.get(), IsPIC,
-      DWARFContext::create(
-          *File, DWARFContext::ProcessDebugRelocations::Ignore, nullptr,
-          opts::DWPPathName, WithColor::defaultErrorHandler,
-          WithColor::defaultWarningHandler, true),
+      DWARFContext::create(*File, DWARFContext::ProcessDebugRelocations::Ignore,
+                           nullptr, opts::DWPPathName,
+                           WithColor::defaultErrorHandler,
+                           WithColor::defaultWarningHandler, true),
       JournalingStreams{Stdout, Stderr});
   if (Error E = BCOrErr.takeError()) {
     Err = std::move(E);

>From 0c8149f0c72eb555938a3441d286a5c995d3ea73 Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Mon, 1 Jun 2026 12:42:03 +0800
Subject: [PATCH 5/7] fix recursive_mutex to mutex

---
 bolt/include/bolt/Core/BinaryContext.h | 4 ++--
 bolt/lib/Core/DIEBuilder.cpp           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bolt/include/bolt/Core/BinaryContext.h b/bolt/include/bolt/Core/BinaryContext.h
index 85aa214cfb331..dee9f0efb7ef7 100644
--- a/bolt/include/bolt/Core/BinaryContext.h
+++ b/bolt/include/bolt/Core/BinaryContext.h
@@ -286,7 +286,7 @@ class BinaryContext {
   void deregisterSectionName(const BinarySection &Section);
 
   /// Mutex used for parallel processing of DWP type units.
-  mutable std::recursive_mutex DWPUnitsMutex;
+  mutable std::mutex DWPUnitsMutex;
 
 public:
   static Expected<std::unique_ptr<BinaryContext>> createBinaryContext(
@@ -295,7 +295,7 @@ class BinaryContext {
       std::unique_ptr<DWARFContext> DwCtx, JournalingStreams Logger);
 
   /// Returns the mutex guarding concurrent access to DWP units.
-  std::recursive_mutex &getUnitsMutex() { return DWPUnitsMutex; }
+  std::mutex &getUnitsMutex() { return DWPUnitsMutex; }
 
   /// Superset of compiler units that will contain overwritten code that needs
   /// new debug info. In a few cases, functions may end up not being
diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index b15b69504e2e1..d047074963440 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -396,7 +396,7 @@ void DIEBuilder::buildDWOUnit(DWARFUnit &U) {
   BuilderState.release();
   BuilderState = std::make_unique<State>();
   if (DwarfContext->isDWP()) {
-    std::unique_lock<std::recursive_mutex> LockGuard(BC.getUnitsMutex());
+    std::unique_lock<std::mutex> LockGuard(BC.getUnitsMutex());
     buildDWPTypeUnitsForUnit(U);
   } else {
     buildTypeUnits(nullptr, false);

>From cd56ef3d5800d75f1b7c84bdb1582484b1c5a77e Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Tue, 2 Jun 2026 15:18:50 +0800
Subject: [PATCH 6/7] fix up

---
 bolt/include/bolt/Core/BinaryContext.h |  2 +-
 bolt/lib/Core/DIEBuilder.cpp           | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bolt/include/bolt/Core/BinaryContext.h b/bolt/include/bolt/Core/BinaryContext.h
index dee9f0efb7ef7..3535061b98bda 100644
--- a/bolt/include/bolt/Core/BinaryContext.h
+++ b/bolt/include/bolt/Core/BinaryContext.h
@@ -286,7 +286,7 @@ class BinaryContext {
   void deregisterSectionName(const BinarySection &Section);
 
   /// Mutex used for parallel processing of DWP type units.
-  mutable std::mutex DWPUnitsMutex;
+  std::mutex DWPUnitsMutex;
 
 public:
   static Expected<std::unique_ptr<BinaryContext>> createBinaryContext(
diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index d047074963440..e0a602c76b7f3 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -283,6 +283,11 @@ void DIEBuilder::buildTypeUnits(DebugStrOffsetsWriter *StrOffsetWriter,
   }
 }
 
+/// Recursively collects type unit signatures from the given DIE and all of its
+/// children.
+///
+/// Note: De-duplication of the collected signatures is handled at the outer
+/// level by registerUnit.
 static void collectReferencedTypeSignatures(DWARFDie Die,
                                             DenseSet<uint64_t> &ProcessedTU,
                                             SmallVectorImpl<uint64_t> &TUlist) {
@@ -309,6 +314,7 @@ static void collectReferencedTypeSignatures(DWARFDie Die,
 }
 
 void DIEBuilder::buildDWPTypeUnitsForUnit(DWARFUnit &U) {
+  std::unique_lock<std::mutex> LockGuard(BC.getUnitsMutex());
   // Avoid processing the same type unit multiple times.
   DenseSet<uint64_t> ProcessedTU;
   SmallVector<uint64_t, 8> TUlist;
@@ -334,19 +340,18 @@ void DIEBuilder::buildDWPTypeUnitsForUnit(DWARFUnit &U) {
     collectReferencedTypeSignatures(TU->getUnitDIE(), ProcessedTU, TUlist);
   }
 
-  // Ensure deterministic order of processing type units
+  // Ensure original order of processing type units
   auto SortByOffset = [](const DWARFUnit *A, const DWARFUnit *B) {
     return A->getOffset() < B->getOffset();
   };
-  llvm::sort(getState().DWARF4TUVector, SortByOffset);
-  llvm::sort(getState().DWARF5TUVector, SortByOffset);
 
-  getState().Type = ProcessingType::DWARF4TUs;
-  for (DWARFUnit *TU : getState().DWARF4TUVector)
-    constructFromUnit(*TU);
+  // For Split DWARF, we have either DWARF4 or DWARF5, they cannot be mixed.
+  std::vector<DWARFUnit *> &TUVec = !getState().DWARF4TUVector.empty()
+                                        ? getState().DWARF4TUVector
+                                        : getState().DWARF5TUVector;
+  llvm::sort(TUVec, SortByOffset);
 
-  getState().Type = ProcessingType::DWARF5TUs;
-  for (DWARFUnit *TU : getState().DWARF5TUVector)
+  for (DWARFUnit *TU : TUVec)
     constructFromUnit(*TU);
 }
 
@@ -396,7 +401,6 @@ void DIEBuilder::buildDWOUnit(DWARFUnit &U) {
   BuilderState.release();
   BuilderState = std::make_unique<State>();
   if (DwarfContext->isDWP()) {
-    std::unique_lock<std::mutex> LockGuard(BC.getUnitsMutex());
     buildDWPTypeUnitsForUnit(U);
   } else {
     buildTypeUnits(nullptr, false);

>From 2720431a6f396c5484c457968eec8d2d492f0432 Mon Sep 17 00:00:00 2001
From: shijinrui <shijinrui at bytedance.com>
Date: Wed, 3 Jun 2026 10:49:07 +0800
Subject: [PATCH 7/7] fix version check

---
 bolt/lib/Core/DIEBuilder.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index e0a602c76b7f3..0957071cb117f 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -321,15 +321,14 @@ void DIEBuilder::buildDWPTypeUnitsForUnit(DWARFUnit &U) {
   // Collecting signatures of type units referenced by this unit.
   collectReferencedTypeSignatures(U.getUnitDIE(), ProcessedTU, TUlist);
 
+  getState().Type = U.getVersion() < 5 ? ProcessingType::DWARF4TUs
+                                       : ProcessingType::DWARF5TUs;
   // addressing type units referenced.
   for (unsigned I = 0; I != TUlist.size(); ++I) {
     const uint64_t Signature = TUlist[I];
     DWARFTypeUnit *TU = DwarfContext->getTypeUnitForHash(Signature, true);
     if (!TU)
       continue;
-
-    getState().Type = TU->getVersion() < 5 ? ProcessingType::DWARF4TUs
-                                           : ProcessingType::DWARF5TUs;
     if (!registerUnit(*TU, false))
       continue;
 
@@ -346,7 +345,7 @@ void DIEBuilder::buildDWPTypeUnitsForUnit(DWARFUnit &U) {
   };
 
   // For Split DWARF, we have either DWARF4 or DWARF5, they cannot be mixed.
-  std::vector<DWARFUnit *> &TUVec = !getState().DWARF4TUVector.empty()
+  std::vector<DWARFUnit *> &TUVec = getState().Type == ProcessingType::DWARF4TUs
                                         ? getState().DWARF4TUVector
                                         : getState().DWARF5TUVector;
   llvm::sort(TUVec, SortByOffset);



More information about the llvm-commits mailing list