Use getNamedGlobal instead of getGlobalVariable. (Fixes self-host).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99385 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index af846329aff23b135507454997f84632a87caeb0..e2953d0c8ba2c876bfe2499a16285a49f21a2de1 100644 (file)
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -1560,7 +1560,7 @@ void CodeGenFunction::InitializeVtablePtrs(const CXXRecordDecl *ClassDecl) {
   if (!ClassDecl->isDynamicClass())
     return;
 
-  llvm::Constant *VTable = CGM.getVTables().getAddrOfVTable(ClassDecl);
+  llvm::Constant *VTable = CGM.getVTables().GetAddrOfVTable(ClassDecl);
   const CodeGenVTables::AddrSubMap_t& AddressPoints =
     CGM.getVTables().getAddressPoints(ClassDecl);
 

diff --git a/lib/CodeGen/CGVTT.cpp b/lib/CodeGen/CGVTT.cpp
index b7b24b84b67dde1a608550823fe49bfa7a0df988..66a96967de95b951da3ddab6fea1ec31965e4897 100644 (file)
--- a/lib/CodeGen/CGVTT.cpp
+++ b/lib/CodeGen/CGVTT.cpp
@@ -268,7 +268,7 @@ public:
       GenerateDefinition(GenerateDefinition) {
     
     // First comes the primary virtual table pointer for the complete class...
-    ClassVtbl = GenerateDefinition ? CGM.getVTables().getAddrOfVTable(Class) :0;
+    ClassVtbl = GenerateDefinition ? CGM.getVTables().GetAddrOfVTable(Class) :0;
 
     llvm::Constant *Init = BuildVtablePtr(ClassVtbl, Class, Class, 0);
     Inits.push_back(Init);

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index c9b099bcd92c61ec7cd6e6d82caee3956bf0331b..3854c404c28faa8db201c9719c1a86b900d792f2 100644 (file)
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -3918,7 +3918,7 @@ CodeGenVTables::GenerateClassData(llvm::GlobalVariable::LinkageTypes Linkage,
   GenerateVTT(Linkage, /*GenerateDefinition=*/true, RD);
 }
 
-llvm::Constant *CodeGenVTables::getAddrOfVTable(const CXXRecordDecl *RD) {
+llvm::Constant *CodeGenVTables::GetAddrOfVTable(const CXXRecordDecl *RD) {
   llvm::SmallString<256> OutName;
   CGM.getMangleContext().mangleCXXVtable(RD, OutName);
   llvm::StringRef Name = OutName.str();
@@ -3926,7 +3926,7 @@ llvm::Constant *CodeGenVTables::getAddrOfVTable(const CXXRecordDecl *RD) {
   const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(CGM.getLLVMContext());
   llvm::ArrayType *ArrayType = llvm::ArrayType::get(Int8PtrTy, 0);
   
-  llvm::GlobalVariable *GV = CGM.getModule().getGlobalVariable(Name);
+  llvm::GlobalVariable *GV = CGM.getModule().getNamedGlobal(Name);
   if (GV) {
     if (!GV->isDeclaration() || GV->getType()->getElementType() == ArrayType)
       return GV;

diff --git a/lib/CodeGen/CGVtable.h b/lib/CodeGen/CGVtable.h
index a38153bc4b8249107e98d4360c70bdaac7e824b5..4a924431af7e5c84d2ebcccdfd179225b049b7ef 100644 (file)
--- a/lib/CodeGen/CGVtable.h
+++ b/lib/CodeGen/CGVtable.h
@@ -316,8 +316,8 @@ public:
   int64_t getVirtualBaseOffsetOffset(const CXXRecordDecl *RD,
                                      const CXXRecordDecl *VBase);
 
-  /// getAddrOfVTable - Get the address of the vtable for the given record decl.
-  llvm::Constant *getAddrOfVTable(const CXXRecordDecl *RD);
+  /// GetAddrOfVTable - Get the address of the vtable for the given record decl.
+  llvm::Constant *GetAddrOfVTable(const CXXRecordDecl *RD);
 
   /// CtorVtableInfo - Information about a constructor vtable.
   struct CtorVtableInfo {