#include "llvm/SymbolTable.h"
#include "llvm/DerivedTypes.h"
#include "llvm/iOther.h"
-#include "llvm/ConstPoolVals.h"
+#include "llvm/ConstantVals.h"
+#include <iostream>
+using std::cerr;
+using std::string;
+using std::map;
// Error - Simple wrapper function to conditionally assign to E and return true.
// This just makes error return conditions a little bit simpler...
for (map<const Value*, Value*>::const_iterator I = M.begin(), E = M.end();
I != E; ++I) {
cerr << " Fr: " << (void*)I->first << " " << I->first
- << " To: " << (void*)I->second << " " << I->second << endl;
+ << " To: " << (void*)I->second << " " << I->second << "\n";
}
}
}
// Check to see if it's a constant that we are interesting in transforming...
- if (ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(In)) {
+ if (Constant *CPV = dyn_cast<Constant>(In)) {
if (!isa<DerivedType>(CPV->getType()))
return CPV; // Simple constants stay identical...
- ConstPoolVal *Result = 0;
+ Constant *Result = 0;
- if (ConstPoolArray *CPA = dyn_cast<ConstPoolArray>(CPV)) {
- const vector<Use> &Ops = CPA->getValues();
- vector<ConstPoolVal*> Operands(Ops.size());
+ if (ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
+ const std::vector<Use> &Ops = CPA->getValues();
+ std::vector<Constant*> Operands(Ops.size());
for (unsigned i = 0; i < Ops.size(); ++i)
Operands[i] =
- cast<ConstPoolVal>(RemapOperand(Ops[i], LocalMap, GlobalMap));
- Result = ConstPoolArray::get(cast<ArrayType>(CPA->getType()), Operands);
- } else if (ConstPoolStruct *CPS = dyn_cast<ConstPoolStruct>(CPV)) {
- const vector<Use> &Ops = CPS->getValues();
- vector<ConstPoolVal*> Operands(Ops.size());
+ cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
+ Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
+ } else if (ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
+ const std::vector<Use> &Ops = CPS->getValues();
+ std::vector<Constant*> Operands(Ops.size());
for (unsigned i = 0; i < Ops.size(); ++i)
Operands[i] =
- cast<ConstPoolVal>(RemapOperand(Ops[i], LocalMap, GlobalMap));
- Result = ConstPoolStruct::get(cast<StructType>(CPS->getType()), Operands);
- } else if (isa<ConstPoolPointerNull>(CPV)) {
+ cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
+ Result = ConstantStruct::get(cast<StructType>(CPS->getType()), Operands);
+ } else if (isa<ConstantPointerNull>(CPV)) {
Result = CPV;
- } else if (ConstPoolPointerRef *CPR = dyn_cast<ConstPoolPointerRef>(CPV)) {
+ } else if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(CPV)) {
Value *V = RemapOperand(CPR->getValue(), LocalMap, GlobalMap);
- Result = ConstPoolPointerRef::get(cast<GlobalValue>(V));
+ Result = ConstantPointerRef::get(cast<GlobalValue>(V));
} else {
assert(0 && "Unknown type of derived type constant value!");
}
// Cache the mapping in our local map structure...
- LocalMap.insert(make_pair(In, CPV));
+ LocalMap.insert(std::make_pair(In, CPV));
return Result;
}
PrintMap(*GlobalMap);
}
- cerr << "Couldn't remap value: " << (void*)In << " " << In << endl;
+ cerr << "Couldn't remap value: " << (void*)In << " " << In << "\n";
assert(0 && "Couldn't remap value!");
return 0;
}
// If the global variable has a name, and that name is already in use in the
// Dest module, make sure that the name is a compatible global variable...
//
- if (SGV->hasName() && (V = ST->lookup(SGV->getType(), SGV->getName()))) {
+ if (SGV->hasExternalLinkage() && SGV->hasName() &&
+ (V = ST->lookup(SGV->getType(), SGV->getName())) &&
+ cast<GlobalVariable>(V)->hasExternalLinkage()) {
// The same named thing is a global variable, because the only two things
// that may be in a module level symbol table are Global Vars and Methods,
// and they both have distinct, nonoverlapping, possible types.
" - Global variables differ in const'ness");
// Okay, everything is cool, remember the mapping...
- ValueMap.insert(make_pair(SGV, DGV));
+ ValueMap.insert(std::make_pair(SGV, DGV));
} else {
// No linking to be performed, simply create an identical version of the
// symbol over in the dest module... the initializer will be filled in
// later by LinkGlobalInits...
//
GlobalVariable *DGV =
- new GlobalVariable(SGV->getType()->getValueType(), SGV->isConstant(),
- 0, SGV->getName());
+ new GlobalVariable(SGV->getType()->getElementType(), SGV->isConstant(),
+ SGV->hasInternalLinkage(), 0, SGV->getName());
// Add the new global to the dest module
Dest->getGlobalList().push_back(DGV);
// Make sure to remember this mapping...
- ValueMap.insert(make_pair(SGV, DGV));
+ ValueMap.insert(std::make_pair(SGV, DGV));
}
}
return false;
if (SGV->hasInitializer()) { // Only process initialized GV's
// Figure out what the initializer looks like in the dest module...
- ConstPoolVal *DInit =
- cast<ConstPoolVal>(RemapOperand(SGV->getInitializer(), ValueMap));
+ Constant *DInit =
+ cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap));
GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]);
- if (DGV->hasInitializer()) {
+ if (DGV->hasInitializer() && SGV->hasExternalLinkage() &&
+ DGV->hasExternalLinkage()) {
if (DGV->getInitializer() != DInit)
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + "':%" +SGV->getName()+
// If the method has a name, and that name is already in use in the
// Dest module, make sure that the name is a compatible method...
//
- if (SM->hasName() && (V = ST->lookup(SM->getType(), SM->getName()))) {
+ if (SM->hasExternalLinkage() && SM->hasName() &&
+ (V = ST->lookup(SM->getType(), SM->getName())) &&
+ cast<Method>(V)->hasExternalLinkage()) {
// The same named thing is a Method, because the only two things
// that may be in a module level symbol table are Global Vars and Methods,
// and they both have distinct, nonoverlapping, possible types.
SM->getName() + "\" - Method is already defined!");
// Otherwise, just remember this mapping...
- ValueMap.insert(make_pair(SM, DM));
+ ValueMap.insert(std::make_pair(SM, DM));
} else {
// Method does not already exist, simply insert an external method
// signature identical to SM into the dest module...
- Method *DM = new Method(SM->getMethodType(), SM->getName());
+ Method *DM = new Method(SM->getMethodType(), SM->hasInternalLinkage(),
+ SM->getName());
// Add the method signature to the dest module...
Dest->getMethodList().push_back(DM);
// ... and remember this mapping...
- ValueMap.insert(make_pair(SM, DM));
+ ValueMap.insert(std::make_pair(SM, DM));
}
}
return false;
Dest->getArgumentList().push_back(DMA);
// Add a mapping to our local map
- LocalMap.insert(make_pair(SMA, DMA));
+ LocalMap.insert(std::make_pair(SMA, DMA));
}
// Loop over all of the basic blocks, copying the instructions over...
// Create new basic block and add to mapping and the Dest method...
BasicBlock *DBB = new BasicBlock(SBB->getName(), Dest);
- LocalMap.insert(make_pair(SBB, DBB));
+ LocalMap.insert(std::make_pair(SBB, DBB));
// Loop over all of the instructions in the src basic block, copying them
// over. Note that this is broken in a strict sense because the cloned
Instruction *DI = SI->clone();
DI->setName(SI->getName());
DBB->getInstList().push_back(DI);
- LocalMap.insert(make_pair(SI, DI));
+ LocalMap.insert(std::make_pair(SI, DI));
}
}