diff options
| -rw-r--r-- | clang/lib/CodeGen/ItaniumCXXABI.cpp | 5 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/dllexport.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp b/clang/lib/CodeGen/ItaniumCXXABI.cpp index 53b74237c19..debdf99b424 100644 --- a/clang/lib/CodeGen/ItaniumCXXABI.cpp +++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp @@ -2848,7 +2848,6 @@ 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) @@ -2900,7 +2899,8 @@ void ItaniumRTTIBuilder::BuildVTablePointer(const Type *Ty) { break; case Type::Record: { - RD = cast<CXXRecordDecl>(cast<RecordType>(Ty)->getDecl()); + const CXXRecordDecl *RD = + cast<CXXRecordDecl>(cast<RecordType>(Ty)->getDecl()); if (!RD->hasDefinition() || !RD->getNumBases()) { VTableName = ClassTypeInfo; @@ -2948,7 +2948,6 @@ void ItaniumRTTIBuilder::BuildVTablePointer(const Type *Ty) { llvm::Constant *VTable = CGM.getModule().getOrInsertGlobal(VTableName, CGM.Int8PtrTy); - CGM.setGVProperties(cast<llvm::GlobalValue>(VTable->stripPointerCasts()), RD); llvm::Type *PtrDiffTy = CGM.getTypes().ConvertType(CGM.getContext().getPointerDiffType()); diff --git a/clang/test/CodeGenCXX/dllexport.cpp b/clang/test/CodeGenCXX/dllexport.cpp index 12d06486604..8820ca8909c 100644 --- a/clang/test/CodeGenCXX/dllexport.cpp +++ b/clang/test/CodeGenCXX/dllexport.cpp @@ -41,8 +41,6 @@ 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 |
