From a6aa18ecdc49cf29eeb4bddab7d3800ef4285285 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 22 Mar 2018 20:33:01 +0000 Subject: [PATCH] Set dso_local on vtables. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@328238 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/ItaniumCXXABI.cpp | 5 +++-- test/CodeGenCXX/dllexport.cpp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp index debdf99b42..53b74237c1 100644 --- a/lib/CodeGen/ItaniumCXXABI.cpp +++ b/lib/CodeGen/ItaniumCXXABI.cpp @@ -2848,6 +2848,7 @@ void ItaniumRTTIBuilder::BuildVTablePointer(const Type *Ty) { const char *VTableName = nullptr; + const CXXRecordDecl *RD = nullptr; switch (Ty->getTypeClass()) { #define TYPE(Class, Base) #define ABSTRACT_TYPE(Class, Base) @@ -2899,8 +2900,7 @@ void ItaniumRTTIBuilder::BuildVTablePointer(const Type *Ty) { break; case Type::Record: { - const CXXRecordDecl *RD = - cast(cast(Ty)->getDecl()); + RD = cast(cast(Ty)->getDecl()); if (!RD->hasDefinition() || !RD->getNumBases()) { VTableName = ClassTypeInfo; @@ -2948,6 +2948,7 @@ void ItaniumRTTIBuilder::BuildVTablePointer(const Type *Ty) { llvm::Constant *VTable = CGM.getModule().getOrInsertGlobal(VTableName, CGM.Int8PtrTy); + CGM.setGVProperties(cast(VTable->stripPointerCasts()), RD); llvm::Type *PtrDiffTy = CGM.getTypes().ConvertType(CGM.getContext().getPointerDiffType()); diff --git a/test/CodeGenCXX/dllexport.cpp b/test/CodeGenCXX/dllexport.cpp index 8820ca8909..12d0648660 100644 --- a/test/CodeGenCXX/dllexport.cpp +++ b/test/CodeGenCXX/dllexport.cpp @@ -41,6 +41,8 @@ struct External { int v; }; // GNU-NOT: @ExternGlobalDecl __declspec(dllexport) extern int ExternGlobalDecl; +// GNU-DAG: @_ZTVN10__cxxabiv117__class_type_infoE = external dso_local global + // dllexport implies a definition. // MSC-DAG: @"?GlobalDef@@3HA" = dso_local dllexport global i32 0, align 4 // GNU-DAG: @GlobalDef = dso_local dllexport global i32 0, align 4 -- 2.50.1