#include "llvm/SymbolTable.h"
#include "llvm/DerivedTypes.h"
#include "llvm/iOther.h"
+#include "llvm/ConstantVals.h"
// Error - Simple wrapper function to conditionally assign to E and return true.
// This just makes error return conditions a little bit simpler...
#include "llvm/Assembly/Writer.h" // TODO: REMOVE
+
+// LinkTypes - Go through the symbol table of the Src module and see if any
+// types are named in the src module that are not named in the Dst module.
+// Make sure there are no type name conflicts.
+//
+static bool LinkTypes(Module *Dest, const Module *Src, string *Err = 0) {
+ // No symbol table? Can't have named types.
+ if (!Src->hasSymbolTable()) return false;
+
+ SymbolTable *DestST = Dest->getSymbolTableSure();
+ const SymbolTable *SrcST = Src->getSymbolTable();
+
+ // Look for a type plane for Type's...
+ SymbolTable::const_iterator PI = SrcST->find(Type::TypeTy);
+ if (PI == SrcST->end()) return false; // No named types, do nothing.
+
+ const SymbolTable::VarMap &VM = PI->second;
+ for (SymbolTable::type_const_iterator I = VM.begin(), E = VM.end();
+ I != E; ++I) {
+ const string &Name = I->first;
+ const Type *RHS = cast<Type>(I->second);
+
+ // Check to see if this type name is already in the dest module...
+ const Type *Entry = cast_or_null<Type>(DestST->lookup(Type::TypeTy, Name));
+ if (Entry) { // Yup, the value already exists...
+ if (Entry != RHS) // If it's the same, noop. Otherwise, error.
+ return Error(Err, "Type named '" + Name +
+ "' of different shape in modules.\n Src='" +
+ Entry->getDescription() + "'. Dest='" +
+ RHS->getDescription() + "'");
+ } else { // Type not in dest module. Add it now.
+ // TODO: FIXME WHEN TYPES AREN'T CONST
+ DestST->insert(Name, const_cast<Type*>(RHS));
+ }
+ }
+ return false;
+}
+
+static void PrintMap(const map<const Value*, Value*> &M) {
+ 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;
+ }
+}
+
+
// RemapOperand - Use LocalMap and GlobalMap to convert references from one
// module to another. This is somewhat sophisticated in that it can
// automatically handle constant references correctly as well...
}
// 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)) {
+ if (ConstantArray *CPA = dyn_cast<ConstantArray>(CPV)) {
const vector<Use> &Ops = CPA->getValues();
- vector<ConstPoolVal*> Operands(Ops.size());
+ 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)) {
+ cast<Constant>(RemapOperand(Ops[i], LocalMap, GlobalMap));
+ Result = ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
+ } else if (ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
const vector<Use> &Ops = CPS->getValues();
- vector<ConstPoolVal*> Operands(Ops.size());
+ 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!");
}
LocalMap.insert(make_pair(In, CPV));
return Result;
}
-
- cerr << "Couldn't remap value: " << In << endl;
+
+ cerr << "XXX LocalMap: \n";
+ PrintMap(LocalMap);
+
+ if (GlobalMap) {
+ cerr << "XXX GlobalMap: \n";
+ PrintMap(*GlobalMap);
+ }
+
+ cerr << "Couldn't remap value: " << (void*)In << " " << In << endl;
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.
//
GlobalVariable *DGV =
new GlobalVariable(SGV->getType()->getValueType(), SGV->isConstant(),
- 0, SGV->getName());
+ SGV->hasInternalLinkage(), 0, SGV->getName());
// Add the new global to the dest module
Dest->getGlobalList().push_back(DGV);
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.
} 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);
II != IE; ++II) {
const Instruction *SI = *II;
Instruction *DI = SI->clone();
+ DI->setName(SI->getName());
DBB->getInstList().push_back(DI);
LocalMap.insert(make_pair(SI, DI));
}
// Loop over all of the methods in the src module, mapping them over as we go
//
for (Module::const_iterator I = Src->begin(), E = Src->end(); I != E; ++I) {
- const Method *SM = *I; // Source Method
- Method *DM = cast<Method>(ValueMap[SM]); // Destination method
+ const Method *SM = *I; // Source Method
+ if (!SM->isExternal()) { // No body if method is external
+ Method *DM = cast<Method>(ValueMap[SM]); // Destination method
+
+ // DM not external SM external?
+ if (!DM->isExternal()) {
+ if (Err)
+ *Err = "Method '" + (SM->hasName() ? SM->getName() : string("")) +
+ "' body multiply defined!";
+ return true;
+ }
- assert(DM && DM->isExternal() && "LinkMethodProtos failed!");
- if (!SM->isExternal()) // External methods are already done
if (LinkMethodBody(DM, SM, ValueMap, Err)) return true;
+ }
}
return false;
}
// shouldn't be relied on to be consistent.
//
bool LinkModules(Module *Dest, const Module *Src, string *ErrorMsg = 0) {
+
+ // LinkTypes - Go through the symbol table of the Src module and see if any
+ // types are named in the src module that are not named in the Dst module.
+ // Make sure there are no type name conflicts.
+ //
+ if (LinkTypes(Dest, Src, ErrorMsg)) return true;
+
// ValueMap - Mapping of values from what they used to be in Src, to what they
// are now in Dest.
//
return false;
}
+