commit f07465828da2a07297646a2277ba8fe3abd2d4c3
author Timur Iskhodzhanov <timurrrr@google.com> Wed Oct 09 11:33:51 2013 +0000
committer Timur Iskhodzhanov <timurrrr@google.com> Wed Oct 09 11:33:51 2013 +0000
tree 1e946e7b5c4d16ac48a034a3599c9534407e158e
parent 728b279dc9405701d4cae02eea49acbb33f86a9b

Code cleanup: rename VTableContext to ItaniumVTableContext, VTableBuilder to ItaniumVTableBuilder and clang-format code around

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

lib/CodeGen/CGVTables.cpp

diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp
index 5ede565..d530016 100644
--- a/lib/CodeGen/CGVTables.cpp
+++ b/lib/CodeGen/CGVTables.cpp
@@ -496,7 +496,7 @@
   if (isa<CXXDestructorDecl>(MD) && GD.getDtorType() == Dtor_Base)
     return;
 
-  const VTableContext::ThunkInfoVectorTy *ThunkInfoVector;
+  const VTableContextBase::ThunkInfoVectorTy *ThunkInfoVector;
   if (VFTContext.isValid()) {
     ThunkInfoVector = VFTContext->getThunkInfo(GD);
   } else {

lib/CodeGen/CGVTables.h

diff --git a/lib/CodeGen/CGVTables.h b/lib/CodeGen/CGVTables.h
index e17ad89..7c94a07 100644
--- a/lib/CodeGen/CGVTables.h
+++ b/lib/CodeGen/CGVTables.h
@@ -33,7 +33,7 @@
 
   // FIXME: Consider moving VTContext and VFTContext into respective CXXABI
   // classes?
-  VTableContext VTContext;
+  ItaniumVTableContext VTContext;
   OwningPtr<MicrosoftVFTableContext> VFTContext;
   
   /// VTableAddressPointsMapTy - Address points for a single vtable.
@@ -72,7 +72,7 @@
 
   CodeGenVTables(CodeGenModule &CGM);
 
-  VTableContext &getVTableContext() { return VTContext; }
+  ItaniumVTableContext &getVTableContext() { return VTContext; }
 
   MicrosoftVFTableContext &getVFTableContext() { return *VFTContext.get(); }
 

lib/CodeGen/CodeGenModule.h

diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h
index c2f9570..1f49802 100644
--- a/lib/CodeGen/CodeGenModule.h
+++ b/lib/CodeGen/CodeGenModule.h
@@ -519,7 +519,9 @@
  
   CodeGenVTables &getVTables() { return VTables; }
 
-  VTableContext &getVTableContext() { return VTables.getVTableContext(); }
+  ItaniumVTableContext &getVTableContext() {
+    return VTables.getVTableContext();
+  }
 
   MicrosoftVFTableContext &getVFTableContext() {
     return VTables.getVFTableContext();

lib/CodeGen/ItaniumCXXABI.cpp

diff --git a/lib/CodeGen/ItaniumCXXABI.cpp b/lib/CodeGen/ItaniumCXXABI.cpp
index 1e34a16..6ffc39e 100644
--- a/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/lib/CodeGen/ItaniumCXXABI.cpp
@@ -921,7 +921,7 @@
   if (VTable->hasInitializer())
     return;
 
-  VTableContext &VTContext = CGM.getVTableContext();
+  ItaniumVTableContext &VTContext = CGM.getVTableContext();
   const VTableLayout &VTLayout = VTContext.getVTableLayout(RD);
   llvm::GlobalVariable::LinkageTypes Linkage = CGM.getVTableLinkage(RD);
 
@@ -1012,7 +1012,7 @@
   Out.flush();
   StringRef Name = OutName.str();
 
-  VTableContext &VTContext = CGM.getVTableContext();
+  ItaniumVTableContext &VTContext = CGM.getVTableContext();
   llvm::ArrayType *ArrayType = llvm::ArrayType::get(
       CGM.Int8PtrTy, VTContext.getVTableLayout(RD).getNumVTableComponents());