diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-03-06 23:28:21 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-03-06 23:28:21 +0000 |
| commit | 19da4e4397024c758dad19eab7f6f0b788879a7b (patch) | |
| tree | aae91d12bfdeb49a4d7f2a70d700821efdd18b3f /clang/lib/CodeGen | |
| parent | cf0eebc6c9a37615fa460a6cac9564e31c835e7a (diff) | |
| download | bcm5719-llvm-19da4e4397024c758dad19eab7f6f0b788879a7b.tar.gz bcm5719-llvm-19da4e4397024c758dad19eab7f6f0b788879a7b.zip | |
Revert r126422 "Use private linkage to avoid symbol conflicts in
corner cases like the one in PR9301." which caused PR9416.
llvm-svn: 127136
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index ecc0a4c2d56..46a76edd0a7 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -642,7 +642,7 @@ CodeGenFunction::EmitAutoVarAlloca(const VarDecl &D) { // candidate nor a __block variable, emit it as a global instead. if (CGM.getCodeGenOpts().MergeAllConstants && Ty.isConstQualified() && !NRVO && !isByRef) { - EmitStaticVarDecl(D, llvm::GlobalValue::PrivateLinkage); + EmitStaticVarDecl(D, llvm::GlobalValue::InternalLinkage); emission.Address = 0; // signal this condition to later callbacks assert(emission.wasEmittedAsGlobal()); |
