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

diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp
index 7a7195aac44e32018aa7dc4a378274d445e5dd1b..a8893d1fc6e1c1c2a084b014b3e968adb3f79e7e 100644 (file)
--- 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 6cb1c9ab37374c394d0ee3ed60cfcb5f24584273..06d186dd8e1b827015f5e627d75c6eb4996edcf8 100644 (file)
--- 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);
+}