diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-01-30 20:53:43 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-01-30 20:53:43 +0000 |
| commit | 2f6bb2bce13084dfc4c8acf47f9eae0578267aaa (patch) | |
| tree | 1b032d63a7539115c5c11287adf990222b8c6fbb /lib/Transforms/Utils/Linker.cpp | |
| parent | 233bfb269682436299260f839d500dbea4c18d4f (diff) | |
* Fix linking of opaque types and their non-opaque versions
* Fix bug: Linker/2003-01-30-LinkerTypeRename.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5441 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/Linker.cpp')
| -rw-r--r-- | lib/Transforms/Utils/Linker.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 5abbcfe819..60c6e03ae1 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -45,13 +45,23 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) { // 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 && !isa<OpaqueType>(Entry)) { // Yup, the value already exists... - if (Entry != RHS && !isa<OpaqueType>(RHS)) - // If it's the same, noop. Otherwise, error. - return Error(Err, "Type named '" + Name + - "' of different shape in modules.\n Src='" + - Entry->getDescription() + "'.\n Dst='" + - RHS->getDescription() + "'"); + if (Entry != RHS) { + if (OpaqueType *OT = dyn_cast<OpaqueType>(const_cast<Type*>(RHS))) { + OT->refineAbstractTypeTo(Entry); + } else { + // If it's the same, noop. Otherwise, error. + return Error(Err, "Type named '" + Name + + "' of different shape in modules.\n Src='" + + Entry->getDescription() + "'.\n Dst='" + + RHS->getDescription() + "'"); + } + } } else { // Type not in dest module. Add it now. + if (Entry) { + OpaqueType *OT = cast<OpaqueType>(const_cast<Type*>(Entry)); + OT->refineAbstractTypeTo(RHS); + } + // TODO: FIXME WHEN TYPES AREN'T CONST DestST->insert(Name, const_cast<Type*>(RHS)); } @@ -236,7 +246,7 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, if (SGV->hasInitializer()) { // Only process initialized GV's // Figure out what the initializer looks like in the dest module... Constant *DInit = - cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap)); + cast<Constant>(RemapOperand(SGV->getInitializer(), ValueMap, 0)); GlobalVariable *DGV = cast<GlobalVariable>(ValueMap[SGV]); if (DGV->hasInitializer() && SGV->hasExternalLinkage() && |