diff options
| -rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 7 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index 6e57f90e99..dd7e059f19 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/lib/CodeGen/CGRTTI.cpp @@ -329,7 +329,8 @@ static bool ContainsIncompleteClassType(QualType Ty) { /// getTypeInfoLinkage - Return the linkage that the type info and type info /// name constants should have for the given type. -static llvm::GlobalVariable::LinkageTypes getTypeInfoLinkage(QualType Ty) { +static llvm::GlobalVariable::LinkageTypes +getTypeInfoLinkage(CodeGenModule &CGM, QualType Ty) { // Itanium C++ ABI 2.9.5p7: // In addition, it and all of the intermediate abi::__pointer_type_info // structs in the chain down to the abi::__class_type_info for the @@ -352,7 +353,7 @@ static llvm::GlobalVariable::LinkageTypes getTypeInfoLinkage(QualType Ty) { if (const RecordType *Record = dyn_cast<RecordType>(Ty)) { const CXXRecordDecl *RD = cast<CXXRecordDecl>(Record->getDecl()); if (RD->isDynamicClass()) - return CodeGenModule::getVTableLinkage(RD); + return CGM.getVTableLinkage(RD); } return llvm::GlobalValue::LinkOnceODRLinkage; @@ -530,7 +531,7 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) { if (IsStdLib) Linkage = llvm::GlobalValue::ExternalLinkage; else - Linkage = getTypeInfoLinkage(Ty); + Linkage = getTypeInfoLinkage(CGM, Ty); // Add the vtable pointer. BuildVTablePointer(cast<Type>(Ty)); diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index 55674ba6a6..f38c0bc018 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -496,8 +496,7 @@ public: /// getVTableLinkage - Return the appropriate linkage for the vtable, VTT, /// and type information of the given class. - static llvm::GlobalVariable::LinkageTypes - getVTableLinkage(const CXXRecordDecl *RD); + llvm::GlobalVariable::LinkageTypes getVTableLinkage(const CXXRecordDecl *RD); /// GetTargetTypeStoreSize - Return the store size, in character units, of /// the given LLVM type. |