diff options
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftRTTI.cpp | 19 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/dllimport-rtti.cpp | 13 |
2 files changed, 30 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/MicrosoftRTTI.cpp b/clang/lib/CodeGen/MicrosoftRTTI.cpp index 776a1612623..f539bfba4a0 100644 --- a/clang/lib/CodeGen/MicrosoftRTTI.cpp +++ b/clang/lib/CodeGen/MicrosoftRTTI.cpp @@ -230,6 +230,20 @@ uint32_t MSRTTIClass::initialize(const MSRTTIClass *Parent, return NumBases; } +static llvm::GlobalValue::LinkageTypes getLinkageForRTTI(QualType Ty) { + switch (Ty->getLinkage()) { + case NoLinkage: + case InternalLinkage: + case UniqueExternalLinkage: + return llvm::GlobalValue::InternalLinkage; + + case VisibleNoLinkage: + case ExternalLinkage: + return llvm::GlobalValue::LinkOnceODRLinkage; + } + llvm_unreachable("Invalid linkage!"); +} + /// \brief An ephemeral helper class for building MS RTTI types. It caches some /// calls to the module and information about the most derived class in a /// hierarchy. @@ -242,7 +256,8 @@ struct MSRTTIBuilder { MSRTTIBuilder(CodeGenModule &CGM, const CXXRecordDecl *RD) : CGM(CGM), Context(CGM.getContext()), VMContext(CGM.getLLVMContext()), - Module(CGM.getModule()), RD(RD), Linkage(CGM.getVTableLinkage(RD)), + Module(CGM.getModule()), RD(RD), + Linkage(getLinkageForRTTI(CGM.getContext().getTagDeclType(RD))), Mangler( cast<MicrosoftMangleContext>(CGM.getCXXABI().getMangleContext())) {} @@ -499,7 +514,7 @@ llvm::Constant *CodeGenModule::getMSTypeDescriptor(QualType Type) { return llvm::ConstantExpr::getBitCast( new llvm::GlobalVariable( getModule(), TypeDescriptorType, /*Constant=*/false, - getTypeInfoLinkage(Type), + getLinkageForRTTI(Type), llvm::ConstantStruct::get(TypeDescriptorType, Fields), MangledName.c_str()), Int8PtrTy); diff --git a/clang/test/CodeGenCXX/dllimport-rtti.cpp b/clang/test/CodeGenCXX/dllimport-rtti.cpp new file mode 100644 index 00000000000..7ed7dadfe40 --- /dev/null +++ b/clang/test/CodeGenCXX/dllimport-rtti.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -triple i686-windows-msvc -emit-llvm -std=c++1y -O1 -disable-llvm-optzns -o - %s | FileCheck %s + +struct __declspec(dllimport) S { + virtual void f(); +} s; +// CHECK-DAG: @"\01??_7S@@6B@" = available_externally dllimport +// CHECK-DAG: @"\01??_R0?AUS@@@8" = linkonce_odr +// CHECK-DAG: @"\01??_R1A@?0A@EA@S@@8" = linkonce_odr +// CHECK-DAG: @"\01??_R2S@@8" = linkonce_odr +// CHECK-DAG: @"\01??_R3S@@8" = linkonce_odr + +struct U : S { +} u; |
