[llvm] 1c9b83e - [dsymutil] Only look for ThinLTO suffixes if we failed to find symbol.

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2021-03-23T10:55:48-07:00
New Revision: 1c9b83edaf93376c59b40f49bb8842ad679bea68

URL: https://github.com/llvm/llvm-project/commit/1c9b83edaf93376c59b40f49bb8842ad679bea68
DIFF: https://github.com/llvm/llvm-project/commit/1c9b83edaf93376c59b40f49bb8842ad679bea68.diff

LOG: [dsymutil] Only look for ThinLTO suffixes if we failed to find symbol.

Only look for symbols with the ThinLTO suffix if we fail to find the
symbol.

Added: 
    

Modified: 
    llvm/tools/dsymutil/MachODebugMapParser.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/dsymutil/MachODebugMapParser.cpp b/llvm/tools/dsymutil/MachODebugMapParser.cpp
index 7d45b2f5e6239..ba2f9a18e6837 100644
--- a/llvm/tools/dsymutil/MachODebugMapParser.cpp
+++ b/llvm/tools/dsymutil/MachODebugMapParser.cpp
@@ -463,13 +463,15 @@ void MachODebugMapParser::handleStabSymbolTableEntry(uint32_t StringIndex,
   }
 
   // ThinLTO adds a unique suffix to exported private symbols.
-  for (auto Iter = CurrentObjectAddresses.begin();
-       Iter != CurrentObjectAddresses.end(); ++Iter) {
-    llvm::StringRef SymbolName = Iter->getKey();
-    auto Pos = SymbolName.rfind(".llvm.");
-    if (Pos != llvm::StringRef::npos && SymbolName.substr(0, Pos) == Name) {
-      ObjectSymIt = Iter;
-      break;
+  if (ObjectSymIt == CurrentObjectAddresses.end()) {
+    for (auto Iter = CurrentObjectAddresses.begin();
+         Iter != CurrentObjectAddresses.end(); ++Iter) {
+      llvm::StringRef SymbolName = Iter->getKey();
+      auto Pos = SymbolName.rfind(".llvm.");
+      if (Pos != llvm::StringRef::npos && SymbolName.substr(0, Pos) == Name) {
+        ObjectSymIt = Iter;
+        break;
+      }
     }
   }