[llvm] 9e45f2c - Couple of post-commit tweaks on 4d58d1d5af31 based on maskray's feedback

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2021-12-29T16:45:00-08:00
New Revision: 9e45f2c308db33f62f2311b957ad8a6868ce172b

URL: https://github.com/llvm/llvm-project/commit/9e45f2c308db33f62f2311b957ad8a6868ce172b
DIFF: https://github.com/llvm/llvm-project/commit/9e45f2c308db33f62f2311b957ad8a6868ce172b.diff

LOG: Couple of post-commit tweaks on 4d58d1d5af31 based on maskray's feedback

Added: 
    

Modified: 
    llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
    llvm/test/DebugInfo/X86/skeleton-unit-verify.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
index df68e257af015..a6f3976fe2016 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp
@@ -322,7 +322,7 @@ unsigned DWARFVerifier::verifyUnits(const DWARFUnitVector &Units) {
   unsigned NumDebugInfoErrors = 0;
   ReferenceMap CrossUnitReferences;
 
-  unsigned int Index = 1;
+  unsigned Index = 1;
   for (const auto &Unit : Units) {
     OS << "Verifying unit: " << Index << " / " << Units.getNumUnits();
     if (const char* Name = Unit->getUnitDIE(true).getShortName())

diff  --git a/llvm/test/DebugInfo/X86/skeleton-unit-verify.s b/llvm/test/DebugInfo/X86/skeleton-unit-verify.s
index 0433e897f6a23..d9c7436d1c750 100644
--- a/llvm/test/DebugInfo/X86/skeleton-unit-verify.s
+++ b/llvm/test/DebugInfo/X86/skeleton-unit-verify.s
@@ -6,7 +6,7 @@
 # CHECK-NEXT: Verifying .debug_types Unit Header Chain...
 # CHECK-NEXT: Verifying non-dwo Units...
 # CHECK-NEXT: Verifying unit: 1 / 2, "test.cpp"
-# CHECK-NEXT: Verifying unit: 2 / 2
+# CHECK-NEXT: Verifying unit: 2 / 2{{$}}
 # CHECK-NEXT: warning: DW_TAG_skeleton_unit has DW_CHILDREN_yes but DIE has no children
 # CHECK-NEXT: DW_TAG_skeleton_unit
 # CHECK-NEXT: error: Skeleton compilation unit has children.