aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CodeGenModule.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2013-04-06 07:07:44 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2013-04-06 07:07:44 +0000
commit6797204b89c0edb9496249fba557b45d8cc9ec76 (patch)
treef24a79e13db2e8646b78596389127cf5cb271a6f /lib/CodeGen/CodeGenModule.cpp
parent0024937dbb23752f606846f4a12aafc712bcde33 (diff)
Remove nondeterminism introduced in r178950.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178952 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
-rw-r--r--lib/CodeGen/CodeGenModule.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 670f06620d..e8e3d1ae76 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1732,13 +1732,15 @@ void CodeGenModule::MaybeHandleStaticInExternC(const SomeDecl *D,
// OK, this is an internal linkage entity inside an extern "C" linkage
// specification. Make a note of that so we can give it the "expected"
// mangled name if nothing else is using that name.
- StaticExternCMap::iterator I =
- StaticExternCValues.insert(std::make_pair(D->getIdentifier(), GV)).first;
+ std::pair<StaticExternCMap::iterator, bool> R =
+ StaticExternCValues.insert(std::make_pair(D->getIdentifier(), GV));
// If we have multiple internal linkage entities with the same name
// in extern "C" regions, none of them gets that name.
- if (I->second != GV)
- I->second = 0;
+ if (!R.second)
+ R.first->second = 0;
+ else
+ StaticExternCIdents.push_back(D->getIdentifier());
}
void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) {
@@ -2947,13 +2949,13 @@ static void EmitGlobalDeclMetadata(CodeGenModule &CGM,
/// to such functions with an unmangled name from inline assembly within the
/// same translation unit.
void CodeGenModule::EmitStaticExternCAliases() {
- for (StaticExternCMap::iterator I = StaticExternCValues.begin(),
- E = StaticExternCValues.end();
- I != E; ++I)
- if (I->second && !getModule().getNamedValue(I->first->getName()))
- AddUsedGlobal(
- new llvm::GlobalAlias(I->second->getType(), I->second->getLinkage(),
- I->first->getName(), I->second, &getModule()));
+ for (unsigned I = 0, N = StaticExternCIdents.size(); I != N; ++I) {
+ IdentifierInfo *Name = StaticExternCIdents[I];
+ llvm::GlobalValue *Val = StaticExternCValues[Name];
+ if (Val && !getModule().getNamedValue(Name->getName()))
+ AddUsedGlobal(new llvm::GlobalAlias(Val->getType(), Val->getLinkage(),
+ Name->getName(), Val, &getModule()));
+ }
}
/// Emits metadata nodes associating all the global values in the