6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-23 01:30:19 +00:00
Code Issues Projects Releases Wiki Activity

LLVM Context-ification.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74948 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2009-07-07 21:07:14 +00:00
parent 18476eeb4a
commit c9ab7bf98f
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lib/Linker/LinkModules.cpp
View File

@ -19,6 +19,7 @@
#include "llvm/Linker.h" #include "llvm/Linker.h"
#include "llvm/Constants.h" #include "llvm/Constants.h"
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
#include "llvm/LLVMContext.h"
#include "llvm/Module.h" #include "llvm/Module.h"
#include "llvm/TypeSymbolTable.h" #include "llvm/TypeSymbolTable.h"
#include "llvm/ValueSymbolTable.h" #include "llvm/ValueSymbolTable.h"
@ -348,7 +349,8 @@ static void PrintMap(const std::map<const Value*, Value*> &M) {
// RemapOperand - Use ValueMap to convert constants from one module to another. // RemapOperand - Use ValueMap to convert constants from one module to another.
static Value *RemapOperand(const Value *In, static Value *RemapOperand(const Value *In,
std::map<const Value*, Value*> &ValueMap) { std::map<const Value*, Value*> &ValueMap,
LLVMContext &Context) {
std::map<const Value*,Value*>::const_iterator I = ValueMap.find(In); std::map<const Value*,Value*>::const_iterator I = ValueMap.find(In);
if (I != ValueMap.end()) if (I != ValueMap.end())
return I->second; return I->second;
@ -363,24 +365,30 @@ static Value *RemapOperand(const Value *In,
if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) { if (const ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
std::vector<Constant*> Operands(CPA->getNumOperands()); std::vector<Constant*> Operands(CPA->getNumOperands());
for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i)
Operands[i] =cast<Constant>(RemapOperand(CPA->getOperand(i), ValueMap)); Operands[i] =cast<Constant>(RemapOperand(CPA->getOperand(i), ValueMap,
Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands); Context));
Result =
Context.getConstantArray(cast<ArrayType>(CPA->getType()), Operands);
} else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) { } else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
std::vector<Constant*> Operands(CPS->getNumOperands()); std::vector<Constant*> Operands(CPS->getNumOperands());
for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i)
Operands[i] =cast<Constant>(RemapOperand(CPS->getOperand(i), ValueMap)); Operands[i] =cast<Constant>(RemapOperand(CPS->getOperand(i), ValueMap,
Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands); Context));
Result =
Context.getConstantStruct(cast<StructType>(CPS->getType()), Operands);
} else if (isa<ConstantPointerNull>(CPV) || isa<UndefValue>(CPV)) { } else if (isa<ConstantPointerNull>(CPV) || isa<UndefValue>(CPV)) {
Result = const_cast<Constant*>(CPV); Result = const_cast<Constant*>(CPV);
} else if (const ConstantVector *CP = dyn_cast<ConstantVector>(CPV)) { } else if (const ConstantVector *CP = dyn_cast<ConstantVector>(CPV)) {
std::vector<Constant*> Operands(CP->getNumOperands()); std::vector<Constant*> Operands(CP->getNumOperands());
for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i)
Operands[i] = cast<Constant>(RemapOperand(CP->getOperand(i), ValueMap)); Operands[i] = cast<Constant>(RemapOperand(CP->getOperand(i), ValueMap,
Result = ConstantVector::get(Operands); Context));
Result = Context.getConstantVector(Operands);
} else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) { } else if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
std::vector<Constant*> Ops; std::vector<Constant*> Ops;
for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i) for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i)
Ops.push_back(cast<Constant>(RemapOperand(CE->getOperand(i),ValueMap))); Ops.push_back(cast<Constant>(RemapOperand(CE->getOperand(i),ValueMap,
Context)));
Result = CE->getWithOperands(Ops); Result = CE->getWithOperands(Ops);
} else { } else {
assert(!isa<GlobalValue>(CPV) && "Unmapped global?"); assert(!isa<GlobalValue>(CPV) && "Unmapped global?");
@ -528,6 +536,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
std::multimap<std::string, GlobalVariable *> &AppendingVars, std::multimap<std::string, GlobalVariable *> &AppendingVars,
std::string *Err) { std::string *Err) {
ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable(); ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable();
LLVMContext &Context = Dest->getContext();
// Loop over all of the globals in the src module, mapping them over as we go // Loop over all of the globals in the src module, mapping them over as we go
for (Module::const_global_iterator I = Src->global_begin(), for (Module::const_global_iterator I = Src->global_begin(),
@ -631,7 +640,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
// Propagate alignment, section, and visibility info. // Propagate alignment, section, and visibility info.
CopyGVAttributes(NewDGV, SGV); CopyGVAttributes(NewDGV, SGV);
DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewDGV, DGV->getType())); DGV->replaceAllUsesWith(Context.getConstantExprBitCast(NewDGV,
DGV->getType()));
// DGV will conflict with NewDGV because they both had the same // DGV will conflict with NewDGV because they both had the same
// name. We must erase this now so ForceRenaming doesn't assert // name. We must erase this now so ForceRenaming doesn't assert
@ -677,7 +687,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
DGV->setLinkage(NewLinkage); DGV->setLinkage(NewLinkage);
// Make sure to remember this mapping... // Make sure to remember this mapping...
ValueMap[SGV] = ConstantExpr::getBitCast(DGV, SGV->getType()); ValueMap[SGV] = Context.getConstantExprBitCast(DGV, SGV->getType());
} }
return false; return false;
} }
@ -710,6 +720,8 @@ CalculateAliasLinkage(const GlobalValue *SGV, const GlobalValue *DGV) {
static bool LinkAlias(Module *Dest, const Module *Src, static bool LinkAlias(Module *Dest, const Module *Src,
std::map<const Value*, Value*> &ValueMap, std::map<const Value*, Value*> &ValueMap,
std::string *Err) { std::string *Err) {
LLVMContext &Context = Dest->getContext();
// Loop over all alias in the src module // Loop over all alias in the src module
for (Module::const_alias_iterator I = Src->alias_begin(), for (Module::const_alias_iterator I = Src->alias_begin(),
E = Src->alias_end(); I != E; ++I) { E = Src->alias_end(); I != E; ++I) {
@ -782,7 +794,7 @@ static bool LinkAlias(Module *Dest, const Module *Src,
// Any uses of DGV need to change to NewGA, with cast, if needed. // Any uses of DGV need to change to NewGA, with cast, if needed.
if (SGA->getType() != DGVar->getType()) if (SGA->getType() != DGVar->getType())
DGVar->replaceAllUsesWith(ConstantExpr::getBitCast(NewGA, DGVar->replaceAllUsesWith(Context.getConstantExprBitCast(NewGA,
DGVar->getType())); DGVar->getType()));
else else
DGVar->replaceAllUsesWith(NewGA); DGVar->replaceAllUsesWith(NewGA);
@ -811,7 +823,7 @@ static bool LinkAlias(Module *Dest, const Module *Src,
// Any uses of DF need to change to NewGA, with cast, if needed. // Any uses of DF need to change to NewGA, with cast, if needed.
if (SGA->getType() != DF->getType()) if (SGA->getType() != DF->getType())
DF->replaceAllUsesWith(ConstantExpr::getBitCast(NewGA, DF->replaceAllUsesWith(Context.getConstantExprBitCast(NewGA,
DF->getType())); DF->getType()));
else else
DF->replaceAllUsesWith(NewGA); DF->replaceAllUsesWith(NewGA);
@ -866,7 +878,8 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src,
if (SGV->hasInitializer()) { // Only process initialized GV's if (SGV->hasInitializer()) { // Only process initialized GV's
// Figure out what the initializer looks like in the dest module... // Figure out what the initializer looks like in the dest module...
Constant *SInit = Constant *SInit =
cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap)); cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap,
Dest->getContext()));
// Grab destination global variable or alias. // Grab destination global variable or alias.
GlobalValue *DGV = cast<GlobalValue>(ValueMap[SGV]->stripPointerCasts()); GlobalValue *DGV = cast<GlobalValue>(ValueMap[SGV]->stripPointerCasts());
@ -914,6 +927,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
std::map<const Value*, Value*> &ValueMap, std::map<const Value*, Value*> &ValueMap,
std::string *Err) { std::string *Err) {
ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable(); ValueSymbolTable &DestSymTab = Dest->getValueSymbolTable();
LLVMContext &Context = Dest->getContext();
// Loop over all of the functions in the src module, mapping them over // Loop over all of the functions in the src module, mapping them over
for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) { for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) {
@ -979,7 +993,8 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
CopyGVAttributes(NewDF, SF); CopyGVAttributes(NewDF, SF);
// Any uses of DF need to change to NewDF, with cast // Any uses of DF need to change to NewDF, with cast
DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewDF, DGV->getType())); DGV->replaceAllUsesWith(Context.getConstantExprBitCast(NewDF,
DGV->getType()));
// DF will conflict with NewDF because they both had the same. We must // DF will conflict with NewDF because they both had the same. We must
// erase this now so ForceRenaming doesn't assert because DF might // erase this now so ForceRenaming doesn't assert because DF might
@ -1017,7 +1032,7 @@ static bool LinkFunctionProtos(Module *Dest, const Module *Src,
DGV->setLinkage(NewLinkage); DGV->setLinkage(NewLinkage);
// Make sure to remember this mapping. // Make sure to remember this mapping.
ValueMap[SF] = ConstantExpr::getBitCast(DGV, SF->getType()); ValueMap[SF] = Context.getConstantExprBitCast(DGV, SF->getType());
} }
return false; return false;
} }
@ -1053,7 +1068,7 @@ static bool LinkFunctionBody(Function *Dest, Function *Src,
for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end(); for (Instruction::op_iterator OI = I->op_begin(), OE = I->op_end();
OI != OE; ++OI) OI != OE; ++OI)
if (!isa<Instruction>(*OI) && !isa<BasicBlock>(*OI)) if (!isa<Instruction>(*OI) && !isa<BasicBlock>(*OI))
*OI = RemapOperand(*OI, ValueMap); *OI = RemapOperand(*OI, ValueMap, *Dest->getContext());
// There is no need to map the arguments anymore. // There is no need to map the arguments anymore.
for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end(); for (Function::arg_iterator I = Src->arg_begin(), E = Src->arg_end();
@ -1094,6 +1109,8 @@ static bool LinkAppendingVars(Module *M,
std::string *ErrorMsg) { std::string *ErrorMsg) {
if (AppendingVars.empty()) return false; // Nothing to do. if (AppendingVars.empty()) return false; // Nothing to do.
LLVMContext &Context = M->getContext();
// Loop over the multimap of appending vars, processing any variables with the // Loop over the multimap of appending vars, processing any variables with the
// same name, forming a new appending global variable with both of the // same name, forming a new appending global variable with both of the
// initializers merged together, then rewrite references to the old variables // initializers merged together, then rewrite references to the old variables
@ -1132,7 +1149,8 @@ static bool LinkAppendingVars(Module *M,
"Appending variables with different section name need to be linked!"); "Appending variables with different section name need to be linked!");
unsigned NewSize = T1->getNumElements() + T2->getNumElements(); unsigned NewSize = T1->getNumElements() + T2->getNumElements();
ArrayType *NewType = ArrayType::get(T1->getElementType(), NewSize); ArrayType *NewType = Context.getArrayType(T1->getElementType(),
NewSize);
G1->setName(""); // Clear G1's name in case of a conflict! G1->setName(""); // Clear G1's name in case of a conflict!
@ -1152,7 +1170,7 @@ static bool LinkAppendingVars(Module *M,
Inits.push_back(I->getOperand(i)); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G1->getInitializer())); assert(isa<ConstantAggregateZero>(G1->getInitializer()));
Constant *CV = Constant::getNullValue(T1->getElementType()); Constant *CV = Context.getNullValue(T1->getElementType());
for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T1->getNumElements(); i != e; ++i)
Inits.push_back(CV); Inits.push_back(CV);
} }
@ -1161,11 +1179,11 @@ static bool LinkAppendingVars(Module *M,
Inits.push_back(I->getOperand(i)); Inits.push_back(I->getOperand(i));
} else { } else {
assert(isa<ConstantAggregateZero>(G2->getInitializer())); assert(isa<ConstantAggregateZero>(G2->getInitializer()));
Constant *CV = Constant::getNullValue(T2->getElementType()); Constant *CV = Context.getNullValue(T2->getElementType());
for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i) for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i)
Inits.push_back(CV); Inits.push_back(CV);
} }
NG->setInitializer(ConstantArray::get(NewType, Inits)); NG->setInitializer(Context.getConstantArray(NewType, Inits));
Inits.clear(); Inits.clear();
// Replace any uses of the two global variables with uses of the new // Replace any uses of the two global variables with uses of the new
@ -1173,8 +1191,10 @@ static bool LinkAppendingVars(Module *M,
// FIXME: This should rewrite simple/straight-forward uses such as // FIXME: This should rewrite simple/straight-forward uses such as
// getelementptr instructions to not use the Cast! // getelementptr instructions to not use the Cast!
G1->replaceAllUsesWith(ConstantExpr::getBitCast(NG, G1->getType())); G1->replaceAllUsesWith(Context.getConstantExprBitCast(NG,
G2->replaceAllUsesWith(ConstantExpr::getBitCast(NG, G2->getType())); G1->getType()));
G2->replaceAllUsesWith(Context.getConstantExprBitCast(NG,
G2->getType()));
// Remove the two globals from the module now... // Remove the two globals from the module now...
M->getGlobalList().erase(G1); M->getGlobalList().erase(G1);