summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-12-17 02:58:03 +0000
committerJohn McCall <rjmccall@apple.com>2010-12-17 02:58:03 +0000
commit09982c0a49d4e5bead417b64365f58987536d878 (patch)
treef065a1580a6b4c31c41eb2e4ff7c456e30b328e8
parent50269280f8cf421fce8358c85788edae2cc2d59a (diff)
downloadbcm5719-llvm-09982c0a49d4e5bead417b64365f58987536d878.tar.gz
bcm5719-llvm-09982c0a49d4e5bead417b64365f58987536d878.zip
Give hidden visibility to RTTI for derived types. This is kindof a hacky
way to do this, but it fixes rdar://problem/8778973 llvm-svn: 122033
-rw-r--r--clang/lib/CodeGen/CGRTTI.cpp8
-rw-r--r--clang/test/CodeGenCXX/rtti-linkage.cpp10
2 files changed, 15 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp
index 7a7195aac44..a8893d1fc6e 100644
--- a/clang/lib/CodeGen/CGRTTI.cpp
+++ b/clang/lib/CodeGen/CGRTTI.cpp
@@ -535,7 +535,8 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) {
BuildVTablePointer(cast<Type>(Ty));
// And the name.
- Fields.push_back(BuildName(Ty, DecideHidden(Ty), Linkage));
+ bool Hidden = DecideHidden(Ty);
+ Fields.push_back(BuildName(Ty, Hidden, Linkage));
switch (Ty->getTypeClass()) {
#define TYPE(Class, Base)
@@ -636,8 +637,9 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) {
if (const RecordType *RT = dyn_cast<RecordType>(Ty))
CGM.setTypeVisibility(GV, cast<CXXRecordDecl>(RT->getDecl()),
/*ForRTTI*/ true, /*ForDefinition*/ true);
- else if (CGM.getCodeGenOpts().HiddenWeakVTables &&
- Linkage == llvm::GlobalValue::WeakODRLinkage)
+ else if (Hidden ||
+ (CGM.getCodeGenOpts().HiddenWeakVTables &&
+ Linkage == llvm::GlobalValue::WeakODRLinkage))
GV->setVisibility(llvm::GlobalValue::HiddenVisibility);
return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
diff --git a/clang/test/CodeGenCXX/rtti-linkage.cpp b/clang/test/CodeGenCXX/rtti-linkage.cpp
index 6cb1c9ab373..06d186dd8e1 100644
--- a/clang/test/CodeGenCXX/rtti-linkage.cpp
+++ b/clang/test/CodeGenCXX/rtti-linkage.cpp
@@ -4,6 +4,10 @@
#include <typeinfo>
// CHECK-WITH-HIDDEN: _ZTSFN12_GLOBAL__N_11DEvE = internal constant
+// CHECK-WITH-HIDDEN: @_ZTSPK2T4 = weak_odr hidden constant
+// CHECK-WITH-HIDDEN: @_ZTS2T4 = weak_odr hidden constant
+// CHECK-WITH-HIDDEN: @_ZTI2T4 = weak_odr hidden constant
+// CHECK-WITH-HIDDEN: @_ZTIPK2T4 = weak_odr hidden constant
// CHECK: _ZTSP1C = internal constant
// CHECK: _ZTS1C = internal constant
@@ -128,3 +132,9 @@ void t3() {
(void) typeid(T<1>);
(void) typeid(T<2>);
}
+
+// rdar://problem/8778973
+struct T4 {};
+void t4(const T4 *ptr) {
+ const void *value = &typeid(ptr);
+}
OpenPOWER on IntegriCloud