diff options
| author | Chris Lattner <sabre@nondot.org> | 2002-09-23 18:14:15 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2002-09-23 18:14:15 +0000 |
| commit | d149c053cdbb406b7b5dff24127b4c509420893e (patch) | |
| tree | 09338a2ac46aded55ce46c96c402a63a92467fd4 /lib/Linker | |
| parent | fb8c89fbd30fad104fce1095ebb3391d5e5e3421 (diff) | |
| download | llvm-d149c053cdbb406b7b5dff24127b4c509420893e.tar.gz llvm-d149c053cdbb406b7b5dff24127b4c509420893e.tar.bz2 llvm-d149c053cdbb406b7b5dff24127b4c509420893e.tar.xz | |
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
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index beab3d5a84..6753f51657 100644 --- 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 |