commit 5eea8768b7a659825a46d7e55730a75282231a6f
author Anders Carlsson <andersca@mac.com> Wed Mar 24 05:32:05 2010 +0000
committer Anders Carlsson <andersca@mac.com> Wed Mar 24 05:32:05 2010 +0000
tree 79ef04b571efdcf63c4445842fc17cd75a0900c3
parent 1a37d0a8f0f7110046e499bbe1117fec91f31f7e

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

lib/CodeGen/CGClass.cpp

diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index af84632..e2953d0 100644
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -1560,7 +1560,7 @@
   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);
 

lib/CodeGen/CGVTT.cpp

diff --git a/lib/CodeGen/CGVTT.cpp b/lib/CodeGen/CGVTT.cpp
index b7b24b8..66a9696 100644
--- a/lib/CodeGen/CGVTT.cpp
+++ b/lib/CodeGen/CGVTT.cpp
@@ -268,7 +268,7 @@
       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);

lib/CodeGen/CGVtable.cpp

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index c9b099b..3854c40 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -3918,7 +3918,7 @@
   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 @@
   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;

lib/CodeGen/CGVtable.h

diff --git a/lib/CodeGen/CGVtable.h b/lib/CodeGen/CGVtable.h
index a38153b..4a92443 100644
--- a/lib/CodeGen/CGVtable.h
+++ b/lib/CodeGen/CGVtable.h
@@ -316,8 +316,8 @@
   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 {