#include "llvm/ValueSymbolTable.h"
#include "llvm/Instructions.h"
#include "llvm/Assembly/Writer.h"
+#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/System/Path.h"
// for debugging...
virtual void dump() const {
- errs() << "AbstractTypeSet!\n";
+ dbgs() << "AbstractTypeSet!\n";
}
};
}
if (DstTy == SrcTy) return false; // If already equal, noop
// If we found our opaque type, resolve it now!
- if (isa<OpaqueType>(DstTy) || isa<OpaqueType>(SrcTy))
+ if (DstTy->isOpaqueTy() || SrcTy->isOpaqueTy())
return ResolveTypes(DstTy, SrcTy);
// Two types cannot be resolved together if they are of different primitive
static void PrintMap(const std::map<const Value*, Value*> &M) {
for (std::map<const Value*, Value*>::const_iterator I = M.begin(), E =M.end();
I != E; ++I) {
- errs() << " Fr: " << (void*)I->first << " ";
+ dbgs() << " Fr: " << (void*)I->first << " ";
I->first->dump();
- errs() << " To: " << (void*)I->second << " ";
+ dbgs() << " To: " << (void*)I->second << " ";
I->second->dump();
- errs() << "\n";
+ dbgs() << "\n";
}
}
#endif
assert(!isa<GlobalValue>(CPV) && "Unmapped global?");
llvm_unreachable("Unknown type of derived type constant value!");
}
- } else if (isa<MetadataBase>(In)) {
- Result = const_cast<Value*>(In);
- } else if (isa<InlineAsm>(In)) {
+ } else if (const MDNode *MD = dyn_cast<MDNode>(In)) {
+ if (MD->isFunctionLocal()) {
+ SmallVector<Value*, 4> Elts;
+ for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i) {
+ if (MD->getOperand(i))
+ Elts.push_back(RemapOperand(MD->getOperand(i), ValueMap));
+ else
+ Elts.push_back(NULL);
+ }
+ Result = MDNode::get(In->getContext(), Elts.data(), MD->getNumOperands());
+ } else {
+ Result = const_cast<Value*>(In);
+ }
+ } else if (isa<MDString>(In) || isa<InlineAsm>(In) || isa<Instruction>(In)) {
Result = const_cast<Value*>(In);
}
}
#ifndef NDEBUG
- errs() << "LinkModules ValueMap: \n";
+ dbgs() << "LinkModules ValueMap: \n";
PrintMap(ValueMap);
- errs() << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
+ dbgs() << "Couldn't remap value: " << (void*)In << " " << *In << "\n";
llvm_unreachable("Couldn't remap value!");
#endif
return 0;
NamedMDNode::Create(SrcNMD, Dest);
else {
// Add Src elements into Dest node.
- for (unsigned i = 0, e = SrcNMD->getNumElements(); i != e; ++i)
- DestNMD->addElement(SrcNMD->getElement(i));
+ for (unsigned i = 0, e = SrcNMD->getNumOperands(); i != e; ++i)
+ DestNMD->addOperand(SrcNMD->getOperand(i));
}
}
}
} else {
// No linking to be performed, simply create an identical version of the
// alias over in the dest module...
-
+ Constant *Aliasee = DAliasee;
+ // Fixup aliases to bitcasts. Note that aliases to GEPs are still broken
+ // by this, but aliases to GEPs are broken to a lot of other things, so
+ // it's less important.
+ if (SGA->getType() != DAliasee->getType())
+ Aliasee = ConstantExpr::getBitCast(DAliasee, SGA->getType());
NewGA = new GlobalAlias(SGA->getType(), SGA->getLinkage(),
- SGA->getName(), DAliasee, Dest);
+ SGA->getName(), Aliasee, Dest);
CopyGVAttributes(NewGA, SGA);
// Proceed to 'common' steps
static bool ResolveAliases(Module *Dest) {
for (Module::alias_iterator I = Dest->alias_begin(), E = Dest->alias_end();
I != E; ++I)
- if (const GlobalValue *GV = I->resolveAliasedGlobal())
- if (GV != I && !GV->isDeclaration())
- I->replaceAllUsesWith(const_cast<GlobalValue*>(GV));
+ // We can't sue resolveGlobalAlias here because we need to preserve
+ // bitcasts and GEPs.
+ if (const Constant *C = I->getAliasee()) {
+ while (dyn_cast<GlobalAlias>(C))
+ C = cast<GlobalAlias>(C)->getAliasee();
+ const GlobalValue *GV = dyn_cast<GlobalValue>(C);
+ if (C != I && !(GV && GV->isDeclaration()))
+ I->replaceAllUsesWith(const_cast<Constant*>(C));
+ }
return false;
}