diff options
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftCXXABI.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftRTTI.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 2e9db03e265..5dc0752aef6 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -1152,7 +1152,7 @@ llvm::GlobalVariable *MicrosoftCXXABI::getAddrOfVTable(const CXXRecordDecl *RD, llvm::GlobalValue::ExternalLinkage; llvm::ArrayType *VTableType = llvm::ArrayType::get(CGM.Int8PtrTy, NumVTableSlots); - if (getContext().getLangOpts().RTTI) { + if (getContext().getLangOpts().RTTIData) { VTableLinkage = llvm::GlobalValue::PrivateLinkage; VTableName = ""; } @@ -1163,7 +1163,8 @@ llvm::GlobalVariable *MicrosoftCXXABI::getAddrOfVTable(const CXXRecordDecl *RD, CGM.getModule(), VTableType, /*isConstant=*/true, VTableLinkage, /*Initializer=*/nullptr, VTableName); VTable->setUnnamedAddr(true); - if (getContext().getLangOpts().RTTI && !RD->hasAttr<DLLImportAttr>()) { + if (getContext().getLangOpts().RTTIData && + !RD->hasAttr<DLLImportAttr>()) { llvm::Value *GEPIndices[] = {llvm::ConstantInt::get(CGM.IntTy, 0), llvm::ConstantInt::get(CGM.IntTy, 1)}; llvm::Constant *VTableGEP = diff --git a/clang/lib/CodeGen/MicrosoftRTTI.cpp b/clang/lib/CodeGen/MicrosoftRTTI.cpp index 51d56e94abe..776a1612623 100644 --- a/clang/lib/CodeGen/MicrosoftRTTI.cpp +++ b/clang/lib/CodeGen/MicrosoftRTTI.cpp @@ -508,7 +508,7 @@ llvm::Constant *CodeGenModule::getMSTypeDescriptor(QualType Type) { llvm::Constant * CodeGenModule::getMSCompleteObjectLocator(const CXXRecordDecl *RD, const VPtrInfo *Info) { - if (!getLangOpts().RTTI) + if (!getLangOpts().RTTIData) return llvm::Constant::getNullValue(Int8PtrTy); return MSRTTIBuilder(*this, RD).getCompleteObjectLocator(Info); } |
