[llvm-branch-commits] [cfe-branch] r122481 - in /cfe/branches/Apple/whitney: lib/CodeGen/CGRTTI.cpp test/CodeGenCXX/rtti-linkage.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec 22 23:40:27 2010
New Revision: 122481

URL: http://llvm.org/viewvc/llvm-project?rev=122481&view=rev
Log:
Merge r122033:
--
Author: John McCall <rjmccall at apple.com>
Date:   Fri Dec 17 02:58:03 2010 +0000

    Give hidden visibility to RTTI for derived types.  This is kindof a hacky
    way to do this, but it fixes rdar://problem/8778973

Modified:
    cfe/branches/Apple/whitney/lib/CodeGen/CGRTTI.cpp
    cfe/branches/Apple/whitney/test/CodeGenCXX/rtti-linkage.cpp

Modified: cfe/branches/Apple/whitney/lib/CodeGen/CGRTTI.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/CodeGen/CGRTTI.cpp?rev=122481&r1=122480&r2=122481&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/CodeGen/CGRTTI.cpp (original)
+++ cfe/branches/Apple/whitney/lib/CodeGen/CGRTTI.cpp Wed Dec 22 23:40:27 2010
@@ -535,7 +535,8 @@
   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 @@
   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);

Modified: cfe/branches/Apple/whitney/test/CodeGenCXX/rtti-linkage.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/CodeGenCXX/rtti-linkage.cpp?rev=122481&r1=122480&r2=122481&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/CodeGenCXX/rtti-linkage.cpp (original)
+++ cfe/branches/Apple/whitney/test/CodeGenCXX/rtti-linkage.cpp Wed Dec 22 23:40:27 2010
@@ -7,6 +7,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: _ZTIN12_GLOBAL__N_11DE to
 
@@ -133,3 +137,9 @@
   (void) typeid(T<1>);
   (void) typeid(T<2>);
 }
+
+// rdar://problem/8778973
+struct T4 {};
+void t4(const T4 *ptr) {
+  const void *value = &typeid(ptr);
+}