nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the case of mangling collisions, make an attempt to note both definitions

Browse Source 
involved.

llvm-svn: 214606
This commit is contained in:
Richard Smith
2014-08-02 00:50:16 +00:00
parent 063f425ea7
commit 6d0e97afcf
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -549,9 +549,9 @@ StringRef CodeGenModule::getMangledName(GlobalDecl GD) {
Str = II->getName();
}
auto &Mangled = Manglings.GetOrCreateValue(Str);
Mangled.second = GD;
return FoundStr = Mangled.first();
// Keep the first result in the case of a mangling collision.
auto Result = Manglings.insert(std::make_pair(Str, GD));
return FoundStr = Result.first->first();
}
StringRef CodeGenModule::getBlockMangledName(GlobalDecl GD,
@@ -571,9 +571,8 @@ StringRef CodeGenModule::getBlockMangledName(GlobalDecl GD,
else
MangleCtx.mangleBlock(cast<DeclContext>(D), BD, Out);
auto &Mangled = Manglings.GetOrCreateValue(Out.str());
Mangled.second = BD;
return Mangled.first();
auto Result = Manglings.insert(std::make_pair(Out.str(), BD));
return Result.first->first();
}
llvm::GlobalValue *CodeGenModule::GetGlobalValue(StringRef Name) {
@@ -2192,6 +2191,9 @@ void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD,
if (!GV->isDeclaration()) {
getDiags().Report(D->getLocation(), diag::err_duplicate_mangled_name);
GlobalDecl OldGD = Manglings.lookup(GV->getName());
if (auto *Prev = OldGD.getDecl())
getDiags().Report(Prev->getLocation(), diag::note_previous_definition);
return;
}