pass via ref, and fix nits

Author: Jinjie-Huang

bolt/include/bolt/Core/BinaryContext.h

@@ -327,7 +327,7 @@ class BinaryContext {
   bool isDWARFLegacyUsed() const { return ContainsDwarfLegacy; }
 
   /// Returns true if DWARFUnit is valid.
-  bool isValidDwarfUnit(DWARFUnit *const DU) const;
+  bool isValidDwarfUnit(DWARFUnit &DU) const;
 
   std::map<unsigned, DwarfLineTable> &getDwarfLineTables() {
     return DwarfLineTablesCUMap;

bolt/lib/Core/BinaryContext.cpp

@@ -1624,15 +1624,15 @@ DWARFContext *BinaryContext::getDWOContext() const {
   return &DWOCUs.begin()->second->getContext();
 }
 
-bool BinaryContext::isValidDwarfUnit(DWARFUnit *const DU) const {
+bool BinaryContext::isValidDwarfUnit(DWARFUnit &DU) const {
   // Invalid DWARF unit with a DWOId but lacking a dwo_name.
-  if (DU->getDWOId() && !DU->isDWOUnit() &&
-      !DU->getUnitDIE().find(
+  if (DU.getDWOId() && !DU.isDWOUnit() &&
+      !DU.getUnitDIE().find(
           {dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name})) {
-    this->outs() << "BOLT-ERROR: Broken DWARF found in CU at offset 0x"
-                 << Twine::utohexstr(DU->getOffset()) << " (DWOId=0x"
-                 << Twine::utohexstr(*(DU->getDWOId()))
-                 << ", missing DW_AT_dwo_name / DW_AT_GNU_dwo_name).\n";
+    this->outs() << "BOLT-ERROR: broken DWARF found in CU at offset 0x"
+                 << Twine::utohexstr(DU.getOffset()) << " (DWOId=0x"
+                 << Twine::utohexstr(*(DU.getDWOId()))
+                 << ", missing DW_AT_dwo_name / DW_AT_GNU_dwo_name)\n";
     return false;
   }
   return true;
@@ -1642,7 +1642,7 @@ bool BinaryContext::isValidDwarfUnit(DWARFUnit *const DU) const {
 void BinaryContext::preprocessDWODebugInfo() {
   for (const std::unique_ptr<DWARFUnit> &CU : DwCtx->compile_units()) {
     DWARFUnit *const DwarfUnit = CU.get();
-    if (!isValidDwarfUnit(DwarfUnit))
+    if (!isValidDwarfUnit(*DwarfUnit))
       continue;
     if (std::optional<uint64_t> DWOId = DwarfUnit->getDWOId()) {
       std::string DWOName = dwarf::toString(

bolt/lib/Core/DIEBuilder.cpp

@@ -1010,7 +1010,7 @@ static uint64_t getHash(const DWARFUnit &DU) {
 }
 
 bool DIEBuilder::registerUnit(DWARFUnit &DU, bool NeedSort) {
-  if (!BC.isValidDwarfUnit(&DU))
+  if (!BC.isValidDwarfUnit(DU))
     return false;
   auto IterGlobal = AllProcessed.insert(getHash(DU));
   // If DU is already in a current working set or was already processed we can

bolt/test/X86/dwarf5-dwoid-no-dwoname.s

@@ -4,7 +4,7 @@
 # RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %s -split-dwarf-file=main.dwo -o main.o
 # RUN: %clang -O3 -g -gdwarf-5 -gsplit-dwarf -Wl,-q %t/main.o -o main.exe
 # RUN: llvm-bolt %t/main.exe -o %t/main.exe.bolt -update-debug-sections  2>&1 | FileCheck %s --check-prefix=PRECHECK
-# PRECHECK: BOLT-ERROR: Broken DWARF found in CU at offset 0x3e (DWOId=0x0, missing DW_AT_dwo_name / DW_AT_GNU_dwo_name).
+# PRECHECK: BOLT-ERROR: broken DWARF found in CU at offset 0x3e (DWOId=0x0, missing DW_AT_dwo_name / DW_AT_GNU_dwo_name)
 
 ## Checks that Broken dwarf CU is removed
 # RUN: llvm-dwarfdump --show-form --verbose --debug-info %t/main.exe.bolt | FileCheck %s --check-prefix=POSTCHECK