forked from OSchip/llvm-project
When emitting RTTI for a non-class type, compute the visibility of the RTTI data based on the explicit visibility of the type.
llvm-svn: 124553
This commit is contained in:
parent
96202e7bbd
commit
49f17537ee
|
@ -570,11 +570,7 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) {
|
|||
llvm::GlobalVariable *TypeName = GetAddrOfTypeName(Ty, Linkage);
|
||||
|
||||
const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext);
|
||||
llvm::Constant *TypeNameAsInt8Ptr =
|
||||
llvm::ConstantExpr::getBitCast(TypeName, Int8PtrTy);
|
||||
|
||||
bool Hidden = DecideHidden(Ty);
|
||||
Fields.push_back(TypeNameAsInt8Ptr);
|
||||
Fields.push_back(llvm::ConstantExpr::getBitCast(TypeName, Int8PtrTy));
|
||||
|
||||
switch (Ty->getTypeClass()) {
|
||||
#define TYPE(Class, Base)
|
||||
|
@ -677,12 +673,21 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) {
|
|||
|
||||
CGM.setTypeVisibility(GV, RD, CodeGenModule::TVK_ForRTTI);
|
||||
CGM.setTypeVisibility(TypeName, RD, CodeGenModule::TVK_ForRTTIName);
|
||||
} else {
|
||||
Visibility TypeInfoVisibility = DefaultVisibility;
|
||||
if (CGM.getCodeGenOpts().HiddenWeakVTables &&
|
||||
Linkage == llvm::GlobalValue::LinkOnceODRLinkage)
|
||||
TypeInfoVisibility = HiddenVisibility;
|
||||
|
||||
} else if (Hidden ||
|
||||
(CGM.getCodeGenOpts().HiddenWeakVTables &&
|
||||
Linkage == llvm::GlobalValue::LinkOnceODRLinkage)) {
|
||||
GV->setVisibility(llvm::GlobalValue::HiddenVisibility);
|
||||
// The type name should have the same visibility as the type itself.
|
||||
Visibility ExplicitVisibility = Ty->getVisibility();
|
||||
TypeName->setVisibility(CodeGenModule::
|
||||
GetLLVMVisibility(ExplicitVisibility));
|
||||
|
||||
TypeInfoVisibility = minVisibility(TypeInfoVisibility, Ty->getVisibility());
|
||||
GV->setVisibility(CodeGenModule::GetLLVMVisibility(TypeInfoVisibility));
|
||||
}
|
||||
|
||||
GV->setUnnamedAddr(true);
|
||||
|
||||
return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <typeinfo>
|
||||
|
||||
// CHECK-WITH-HIDDEN: _ZTSFN12_GLOBAL__N_11DEvE = internal constant
|
||||
// CHECK-WITH-HIDDEN: @_ZTSPK2T4 = linkonce_odr constant
|
||||
// CHECK-WITH-HIDDEN: @_ZTSPK2T4 = linkonce_odr hidden constant
|
||||
// CHECK-WITH-HIDDEN: @_ZTS2T4 = linkonce_odr hidden constant
|
||||
// CHECK-WITH-HIDDEN: @_ZTI2T4 = linkonce_odr hidden unnamed_addr constant
|
||||
// CHECK-WITH-HIDDEN: @_ZTIPK2T4 = linkonce_odr hidden unnamed_addr constant
|
||||
|
|
|
@ -10,7 +10,7 @@ namespace Test1 {
|
|||
// A is explicitly marked hidden, so all RTTI data should also be marked hidden.
|
||||
// CHECK-TEST1: @_ZTSN5Test11AE = linkonce_odr hidden constant
|
||||
// CHECK-TEST1: @_ZTIN5Test11AE = linkonce_odr hidden unnamed_addr constant
|
||||
// CHECK-TEST1: @_ZTSPN5Test11AE = linkonce_odr constant
|
||||
// CHECK-TEST1: @_ZTSPN5Test11AE = linkonce_odr hidden constant
|
||||
// CHECK-TEST1: @_ZTIPN5Test11AE = linkonce_odr hidden unnamed_addr constant
|
||||
struct __attribute__((visibility("hidden"))) A { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue