Insert resolved constants into the global map so they are reused correctly.

This bug was exposed linking the SPEC benchmark suite.

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

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index beab3d5a847eab8a0ae010552fc2982fcf1529f7..6753f51657c78cb522e6fd64442755c939748ae7 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -81,7 +81,7 @@ static void PrintMap(const map<const Value*, Value*> &M) {
 // automatically handle constant references correctly as well...
 //
 static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
-                           const map<const Value*, Value*> *GlobalMap = 0) {
+                           map<const Value*, Value*> *GlobalMap = 0) {
   map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
   if (I != LocalMap.end()) return I->second;
 
@@ -148,7 +148,10 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
     }
 
     // Cache the mapping in our local map structure...
-    LocalMap.insert(std::make_pair(In, Result));
+    if (GlobalMap)
+      GlobalMap->insert(std::make_pair(In, Result));
+    else
+      LocalMap.insert(std::make_pair(In, Result));
     return Result;
   }
 
@@ -314,7 +317,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
 // function, and that Src is not.
 //
 static bool LinkFunctionBody(Function *Dest, const Function *Src,
-                             const map<const Value*, Value*> &GlobalMap,
+                             map<const Value*, Value*> &GlobalMap,
                              string *Err = 0) {
   assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
   map<const Value*, Value*> LocalMap;   // Map for function local values

diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp
index beab3d5a847eab8a0ae010552fc2982fcf1529f7..6753f51657c78cb522e6fd64442755c939748ae7 100644 (file)
--- a/lib/Transforms/Utils/Linker.cpp
+++ b/lib/Transforms/Utils/Linker.cpp
@@ -81,7 +81,7 @@ static void PrintMap(const map<const Value*, Value*> &M) {
 // automatically handle constant references correctly as well...
 //
 static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
-                           const map<const Value*, Value*> *GlobalMap = 0) {
+                           map<const Value*, Value*> *GlobalMap = 0) {
   map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
   if (I != LocalMap.end()) return I->second;
 
@@ -148,7 +148,10 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
     }
 
     // Cache the mapping in our local map structure...
-    LocalMap.insert(std::make_pair(In, Result));
+    if (GlobalMap)
+      GlobalMap->insert(std::make_pair(In, Result));
+    else
+      LocalMap.insert(std::make_pair(In, Result));
     return Result;
   }
 
@@ -314,7 +317,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
 // function, and that Src is not.
 //
 static bool LinkFunctionBody(Function *Dest, const Function *Src,
-                             const map<const Value*, Value*> &GlobalMap,
+                             map<const Value*, Value*> &GlobalMap,
                              string *Err = 0) {
   assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
   map<const Value*, Value*> LocalMap;   // Map for function local values

diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index beab3d5a847eab8a0ae010552fc2982fcf1529f7..6753f51657c78cb522e6fd64442755c939748ae7 100644 (file)
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -81,7 +81,7 @@ static void PrintMap(const map<const Value*, Value*> &M) {
 // automatically handle constant references correctly as well...
 //
 static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
-                           const map<const Value*, Value*> *GlobalMap = 0) {
+                           map<const Value*, Value*> *GlobalMap = 0) {
   map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
   if (I != LocalMap.end()) return I->second;
 
@@ -148,7 +148,10 @@ static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap,
     }
 
     // Cache the mapping in our local map structure...
-    LocalMap.insert(std::make_pair(In, Result));
+    if (GlobalMap)
+      GlobalMap->insert(std::make_pair(In, Result));
+    else
+      LocalMap.insert(std::make_pair(In, Result));
     return Result;
   }
 
@@ -314,7 +317,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
 // function, and that Src is not.
 //
 static bool LinkFunctionBody(Function *Dest, const Function *Src,
-                             const map<const Value*, Value*> &GlobalMap,
+                             map<const Value*, Value*> &GlobalMap,
                              string *Err = 0) {
   assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
   map<const Value*, Value*> LocalMap;   // Map for function local values