maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

This bug was exposed linking the SPEC benchmark suite.

llvm-svn: 3888
This commit is contained in:
Chris Lattner 2002-09-23 18:14:15 +00:00
parent 6b9be6f95a
commit 4037a261d8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Transforms/Utils/Linker.cpp
View File

@ -81,7 +81,7 @@ static void PrintMap(const map<const Value*, Value*> &M) {
// automatically handle constant references correctly as well... // automatically handle constant references correctly as well...
// //
static Value *RemapOperand(const Value *In, map<const Value*, Value*> &LocalMap, 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); map<const Value*,Value*>::const_iterator I = LocalMap.find(In);
if (I != LocalMap.end()) return I->second; 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... // 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; return Result;
} }
@ -314,7 +317,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
// function, and that Src is not. // function, and that Src is not.
// //
static bool LinkFunctionBody(Function *Dest, const Function *Src, static bool LinkFunctionBody(Function *Dest, const Function *Src,
const map<const Value*, Value*> &GlobalMap, map<const Value*, Value*> &GlobalMap,
string *Err = 0) { string *Err = 0) {
assert(Src && Dest && Dest->isExternal() && !Src->isExternal()); assert(Src && Dest && Dest->isExternal() && !Src->isExternal());
map<const Value*, Value*> LocalMap; // Map for function local values map<const Value*, Value*> LocalMap; // Map for function local values