mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-18 12:29:21 +00:00
Fix bug: Linker/2003-10-21-ConflictingTypesTolerance.ll
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9357 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
3d6a08d131
commit
aeb18ce9c0
@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
|
||||
}
|
||||
|
||||
// If we STILL cannot resolve the types, then there is something wrong.
|
||||
// Report the error.
|
||||
// Report the warning and delete one of the names.
|
||||
if (DelayedTypesToResolve.size() == OldSize) {
|
||||
// Build up an error message of all of the mismatched types.
|
||||
std::string ErrorMessage;
|
||||
for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
|
||||
const std::string &Name = DelayedTypesToResolve[i];
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
ErrorMessage += " Type named '" + Name +
|
||||
"' conflicts.\n Src='" + T1->getDescription() +
|
||||
"'.\n Dest='" + T2->getDescription() + "'\n";
|
||||
}
|
||||
return Error(Err, "Type conflict between types in modules:\n" +
|
||||
ErrorMessage);
|
||||
const std::string &Name = DelayedTypesToResolve.back();
|
||||
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
std::cerr << "WARNING: Type conflict between types named '" << Name
|
||||
<< "'.\n Src='" << *T1 << "'.\n Dest='" << *T2 << "'\n";
|
||||
|
||||
// Remove the symbol name from the destination.
|
||||
DelayedTypesToResolve.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
|
||||
}
|
||||
|
||||
// If we STILL cannot resolve the types, then there is something wrong.
|
||||
// Report the error.
|
||||
// Report the warning and delete one of the names.
|
||||
if (DelayedTypesToResolve.size() == OldSize) {
|
||||
// Build up an error message of all of the mismatched types.
|
||||
std::string ErrorMessage;
|
||||
for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
|
||||
const std::string &Name = DelayedTypesToResolve[i];
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
ErrorMessage += " Type named '" + Name +
|
||||
"' conflicts.\n Src='" + T1->getDescription() +
|
||||
"'.\n Dest='" + T2->getDescription() + "'\n";
|
||||
}
|
||||
return Error(Err, "Type conflict between types in modules:\n" +
|
||||
ErrorMessage);
|
||||
const std::string &Name = DelayedTypesToResolve.back();
|
||||
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
std::cerr << "WARNING: Type conflict between types named '" << Name
|
||||
<< "'.\n Src='" << *T1 << "'.\n Dest='" << *T2 << "'\n";
|
||||
|
||||
// Remove the symbol name from the destination.
|
||||
DelayedTypesToResolve.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -215,20 +215,17 @@ static bool LinkTypes(Module *Dest, const Module *Src, std::string *Err) {
|
||||
}
|
||||
|
||||
// If we STILL cannot resolve the types, then there is something wrong.
|
||||
// Report the error.
|
||||
// Report the warning and delete one of the names.
|
||||
if (DelayedTypesToResolve.size() == OldSize) {
|
||||
// Build up an error message of all of the mismatched types.
|
||||
std::string ErrorMessage;
|
||||
for (unsigned i = 0, e = DelayedTypesToResolve.size(); i != e; ++i) {
|
||||
const std::string &Name = DelayedTypesToResolve[i];
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
ErrorMessage += " Type named '" + Name +
|
||||
"' conflicts.\n Src='" + T1->getDescription() +
|
||||
"'.\n Dest='" + T2->getDescription() + "'\n";
|
||||
}
|
||||
return Error(Err, "Type conflict between types in modules:\n" +
|
||||
ErrorMessage);
|
||||
const std::string &Name = DelayedTypesToResolve.back();
|
||||
|
||||
const Type *T1 = cast<Type>(VM.find(Name)->second);
|
||||
const Type *T2 = cast<Type>(DestST->lookup(Type::TypeTy, Name));
|
||||
std::cerr << "WARNING: Type conflict between types named '" << Name
|
||||
<< "'.\n Src='" << *T1 << "'.\n Dest='" << *T2 << "'\n";
|
||||
|
||||
// Remove the symbol name from the destination.
|
||||
DelayedTypesToResolve.pop_back();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user