[RuntimeDyld] Make RuntimeDyldImpl::resolveExternalSymbols preserve the

[oota-llvm.git] / lib / ExecutionEngine / RuntimeDyld / RuntimeDyld.cpp

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index 0956761187d6064e1daa9965a004d4dcf67503e1..d415514df0fb66ea5c4bc1c5d121142cfa45280c 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -620,6 +620,8 @@ void RuntimeDyldImpl::resolveRelocationList(const RelocationList &Relocs,
 }
 
 void RuntimeDyldImpl::resolveExternalSymbols() {
+  StringMap<RelocationList> ProcessedSymbols;
+
   while (!ExternalSymbolRelocations.empty()) {
     StringMap<RelocationList>::iterator i = ExternalSymbolRelocations.begin();
 
@@ -665,8 +667,20 @@ void RuntimeDyldImpl::resolveExternalSymbols() {
       resolveRelocationList(Relocs, Addr);
     }
 
+    ProcessedSymbols[i->first()] = i->second;
     ExternalSymbolRelocations.erase(i);
   }
+
+  // Restore the relocation entries that were consumed in the loop above:
+  //
+  // FIXME: Replace the following loop with:
+  //           std::swap(ProcessedSymbols, ExternalSymbolRelocations)
+  //        once StringMap has copy and move construction.
+  for (StringMap<RelocationList>::iterator I = ProcessedSymbols.begin(),
+                                           E = ProcessedSymbols.end();
+       I != E; ++I) {
+    ExternalSymbolRelocations[I->first()] = I->second;
+  }
 }
 
 //===----------------------------------------------------------------------===//