6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-01 15:11:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix a nasty bug in the type remapping stuff that I added that is breaking kc++ on

Browse Source 
the build bot in some cases.  The basic issue happens when a source module contains
both a "%foo" type and a "%foo.42" type.  It will see the later one, check to see if
the destination module contains a "%foo" type, and it will return true... because
both the source and destination modules are in the same LLVMContext.  We don't want
to map source types to other source types, so don't do the remapping if the mapped
type came from the source module.

Unfortunately, I've been unable to reduce a decent testcase for this, kc++ is 
pretty great that way.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147010 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2011-12-20 23:14:57 +00:00
parent aee718beac
commit 1a31f3b90c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Linker/LinkModules.cpp
View File

@ -148,6 +148,7 @@ bool TypeMapTy::areTypesIsomorphic(Type *DstTy, Type *SrcTy) {
if (PointerType *PT = dyn_cast<PointerType>(DstTy)) { if (PointerType *PT = dyn_cast<PointerType>(DstTy)) {
if (PT->getAddressSpace() != cast<PointerType>(SrcTy)->getAddressSpace()) if (PT->getAddressSpace() != cast<PointerType>(SrcTy)->getAddressSpace())
return false; return false;
} else if (FunctionType *FT = dyn_cast<FunctionType>(DstTy)) { } else if (FunctionType *FT = dyn_cast<FunctionType>(DstTy)) {
if (FT->isVarArg() != cast<FunctionType>(SrcTy)->isVarArg()) if (FT->isVarArg() != cast<FunctionType>(SrcTy)->isVarArg())
return false; return false;
@ -567,6 +568,9 @@ void ModuleLinker::computeTypeMapping() {
std::vector<StructType*> SrcStructTypes; std::vector<StructType*> SrcStructTypes;
SrcM->findUsedStructTypes(SrcStructTypes); SrcM->findUsedStructTypes(SrcStructTypes);
SmallPtrSet<StructType*, 32> SrcStructTypesSet(SrcStructTypes.begin(),
SrcStructTypes.end());
for (unsigned i = 0, e = SrcStructTypes.size(); i != e; ++i) { for (unsigned i = 0, e = SrcStructTypes.size(); i != e; ++i) {
StructType *ST = SrcStructTypes[i]; StructType *ST = SrcStructTypes[i];
if (!ST->hasName()) continue; if (!ST->hasName()) continue;
@ -579,7 +583,10 @@ void ModuleLinker::computeTypeMapping() {
// Check to see if the destination module has a struct with the prefix name. // Check to see if the destination module has a struct with the prefix name.
if (StructType *DST = DstM->getTypeByName(ST->getName().substr(0, DotPos))) if (StructType *DST = DstM->getTypeByName(ST->getName().substr(0, DotPos)))
TypeMap.addTypeMapping(DST, ST); // 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);
} }