Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

No description provided.

@kazutakahirata kazutakahirata requested a review from nikic March 6, 2025 05:57
@llvmbot
Copy link
Member

llvmbot commented Mar 6, 2025

@llvm/pr-subscribers-debuginfo

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/129991.diff

1 Files Affected:

  • (modified) llvm/tools/llvm-dwarfdump/Statistics.cpp (+6-4)
diff --git a/llvm/tools/llvm-dwarfdump/Statistics.cpp b/llvm/tools/llvm-dwarfdump/Statistics.cpp
index 1670709c08314..af9a93ad35b9c 100644
--- a/llvm/tools/llvm-dwarfdump/Statistics.cpp
+++ b/llvm/tools/llvm-dwarfdump/Statistics.cpp
@@ -529,8 +529,9 @@ static void collectStatsRecursive(
     auto OffsetFn = Die.find(dwarf::DW_AT_abstract_origin);
     if (OffsetFn) {
       uint64_t OffsetOfInlineFnCopy = (*OffsetFn).getRawUValue();
-      if (LocalAbstractOriginFnInfo.count(OffsetOfInlineFnCopy)) {
-        AbstractOriginVars = LocalAbstractOriginFnInfo[OffsetOfInlineFnCopy];
+      if (auto It = LocalAbstractOriginFnInfo.find(OffsetOfInlineFnCopy);
+          It != LocalAbstractOriginFnInfo.end()) {
+        AbstractOriginVars = It->second;
         AbstractOriginVarsPtr = &AbstractOriginVars;
       } else {
         // This means that the DW_AT_inline fn copy is out of order
@@ -782,9 +783,10 @@ static void collectZeroLocCovForVarsWithAbstractOrigin(
     // If there is no entry within LocalAbstractOriginFnInfo for the given
     // FnCopyRawUValue, function isn't out-of-order in DWARF. Rather, we have
     // CrossCU referencing.
-    if (!LocalAbstractOriginFnInfo.count(FnCopyRawUValue))
+    auto It = LocalAbstractOriginFnInfo.find(FnCopyRawUValue);
+    if (It == LocalAbstractOriginFnInfo.end())
       continue;
-    AbstractOriginVars = LocalAbstractOriginFnInfo[FnCopyRawUValue];
+    AbstractOriginVars = It->second;
     updateVarsWithAbstractOriginLocCovInfo(FnDieWithAbstractOrigin,
                                            AbstractOriginVars);
 

@kazutakahirata kazutakahirata merged commit abcab4f into llvm:main Mar 6, 2025
13 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_001_repeated_hash_lookups_llvm_dwarfdump branch March 6, 2025 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants