diff options
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 30 | ||||
| -rw-r--r-- | test/Linker/link-type-names.ll | 3 |
2 files changed, 30 insertions, 3 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index e87d6dd..8af2c88 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -581,6 +581,36 @@ void ModuleLinker::computeTypeMapping() { TypeMap.addTypeMapping(DGV->getType(), I->getType()); } + // Incorporate types by name, scanning all the types in the source module. + // At this point, the destination module may have a type "%foo = { i32 }" for + // example. When the source module got loaded into the same LLVMContext, if + // it had the same type, it would have been renamed to "%foo.42 = { i32 }". + // Though it isn't required for correctness, attempt to link these up to clean + // up the IR. + std::vector<StructType*> SrcStructTypes; + SrcM->findUsedStructTypes(SrcStructTypes); + + SmallPtrSet<StructType*, 32> SrcStructTypesSet(SrcStructTypes.begin(), + SrcStructTypes.end()); + + for (unsigned i = 0, e = SrcStructTypes.size(); i != e; ++i) { + StructType *ST = SrcStructTypes[i]; + if (!ST->hasName()) continue; + + // Check to see if there is a dot in the name followed by a digit. + size_t DotPos = ST->getName().rfind('.'); + if (DotPos == 0 || DotPos == StringRef::npos || + ST->getName().back() == '.' || !isdigit(ST->getName()[DotPos+1])) + continue; + + // Check to see if the destination module has a struct with the prefix name. + if (StructType *DST = DstM->getTypeByName(ST->getName().substr(0, DotPos))) + // Don't use it if this actually came from the source module. They're in + // the same LLVMContext after all. + if (!SrcStructTypesSet.count(DST)) + TypeMap.addTypeMapping(DST, ST); + } + // Don't bother incorporating aliases, they aren't generally typed well. // Now that we have discovered all of the type equivalences, get a body for diff --git a/test/Linker/link-type-names.ll b/test/Linker/link-type-names.ll index a97b352..bfc3b64 100644 --- a/test/Linker/link-type-names.ll +++ b/test/Linker/link-type-names.ll @@ -1,10 +1,7 @@ ; RUN: echo "%X = type { i32 } @G2 = global %X { i32 4 }" > %t.ll ; RUN: llvm-link %s %t.ll -S | FileCheck %s -; XFAIL: * ; PR11464 -; FIXME: XFAIL until <rdar://problem/10913281> is addressed. - %X = type { i32 } @G = global %X { i32 4 } |