diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2010-10-11 03:25:53 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2010-10-11 03:25:53 +0000 |
| commit | 6d576051b9ca56fe962077fb194ed2917539989a (patch) | |
| tree | a08305194b30cfff3263fc1f5ecf25376c815cd5 | |
| parent | 2c6899fa1a748fe211280de3dfb478be56a9be6a (diff) | |
Don't let typeinfo name symbols be 'internal hidden', it can lead to linker conflicts
with similarly named classes in anonymous namespaces.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116185 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/rtti-linkage.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index 60df613f65..e98d0e8cea 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/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/test/CodeGenCXX/rtti-linkage.cpp b/test/CodeGenCXX/rtti-linkage.cpp index efa336dda4..211f57634c 100644 --- a/test/CodeGenCXX/rtti-linkage.cpp +++ b/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 |