summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-10-11 03:25:53 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-10-11 03:25:53 +0000
commitf0e31c8b9cd2352eb190cde3166393e590f02002 (patch)
treebb135021674cdbaecb27dc37f38572c4a852d512
parent11f6be1ce81df7da5d2f37119777d0ad6afa1115 (diff)
downloadbcm5719-llvm-f0e31c8b9cd2352eb190cde3166393e590f02002.tar.gz
bcm5719-llvm-f0e31c8b9cd2352eb190cde3166393e590f02002.zip
Don't let typeinfo name symbols be 'internal hidden', it can lead to linker conflicts
with similarly named classes in anonymous namespaces. llvm-svn: 116185
-rw-r--r--clang/lib/CodeGen/CGRTTI.cpp2
-rw-r--r--clang/test/CodeGenCXX/rtti-linkage.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp
index 60df613f65e..e98d0e8cead 100644
--- a/clang/lib/CodeGen/CGRTTI.cpp
+++ b/clang/lib/CodeGen/CGRTTI.cpp
@@ -85,7 +85,7 @@ public:
OGV->replaceAllUsesWith(NewPtr);
OGV->eraseFromParent();
}
- if (Hidden)
+ if (Hidden && Linkage != llvm::GlobalValue::InternalLinkage)
GV->setVisibility(llvm::GlobalVariable::HiddenVisibility);
return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
}
diff --git a/clang/test/CodeGenCXX/rtti-linkage.cpp b/clang/test/CodeGenCXX/rtti-linkage.cpp
index efa336dda4e..211f57634c6 100644
--- a/clang/test/CodeGenCXX/rtti-linkage.cpp
+++ b/clang/test/CodeGenCXX/rtti-linkage.cpp
@@ -1,11 +1,12 @@
// RUN: %clang_cc1 %s -I%S -triple=x86_64-apple-darwin10 -fhidden-weak-vtables -emit-llvm -o - | sort | FileCheck %s
+// RUN: %clang_cc1 %s -I%S -triple=x86_64-apple-darwin10 -fvisibility hidden -fhidden-weak-vtables -emit-llvm -o - | FileCheck -check-prefix=CHECK-WITH-HIDDEN %s
// FIXME: Fails on Win32, dunno why.
// XFAIL: win32
#include <typeinfo>
-
+// CHECK-WITH-HIDDEN: _ZTSFN12_GLOBAL__N_11DEvE = internal constant
// CHECK: _ZTIN12_GLOBAL__N_11DE to
OpenPOWER on IntegriCloud