From: Lang Hames <lhames@gmail.com>
Date: Wed, 7 May 2014 23:35:53 +0000 (+0000)
Subject: Back out r208257 while I investigate tester failures.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52298507e816d928bc2dd4610cc317539bfae958;p=oota-llvm.git

Back out r208257 while I investigate tester failures.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208267 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index d415514df0f..0956761187d 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -620,8 +620,6 @@ void RuntimeDyldImpl::resolveRelocationList(const RelocationList &Relocs,
 }
 
 void RuntimeDyldImpl::resolveExternalSymbols() {
-  StringMap<RelocationList> ProcessedSymbols;
-
   while (!ExternalSymbolRelocations.empty()) {
     StringMap<RelocationList>::iterator i = ExternalSymbolRelocations.begin();
 
@@ -667,20 +665,8 @@ 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;
-  }
 }
 
 //===----------------------------------------------------------------------===//