diff options
| author | John McCall <rjmccall@apple.com> | 2010-12-17 02:58:03 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-12-17 02:58:03 +0000 |
| commit | 9c39acfda88268bcc7fb5521b55ce41942dcb3b0 (patch) | |
| tree | 583b0f061fc6cc8bb69138df21c617deebbc2f51 | |
| parent | 2e219b8d253dbb901206b14e5643cc9d0edd662b (diff) | |
Give hidden visibility to RTTI for derived types. This is kindof a hacky
way to do this, but it fixes rdar://problem/8778973
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122033 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGenCXX/rtti-linkage.cpp | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index 7a7195aac4..a8893d1fc6 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/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/test/CodeGenCXX/rtti-linkage.cpp b/test/CodeGenCXX/rtti-linkage.cpp index 6cb1c9ab37..06d186dd8e 100644 --- a/test/CodeGenCXX/rtti-linkage.cpp +++ b/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); +} |