Move some common code into BuildVTT.

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

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 67b2b3dcb69704efcb47f09ab543de7ad271ec5f..2f5681e181a12f8e15e6397600c56726f1fd05da 100644 (file)
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -1367,6 +1367,9 @@ class VTTBuilder {
     if (RD->getNumVBases() == 0)
       return;
 
+    // Remember the sub-VTT index.
+    SubVTTIndicies[RD] = Inits.size();
+
     llvm::Constant *Vtable;
     const CXXRecordDecl *VtableClass;
 
@@ -1403,9 +1406,6 @@ class VTTBuilder {
       const ASTRecordLayout &Layout = CGM.getContext().getASTRecordLayout(RD);
       uint64_t BaseOffset = Offset + Layout.getBaseClassOffset(Base);
       
-      // Remember the sub-VTT index.
-      SubVTTIndicies[Base] = Inits.size();
-
       BuildVTT(Base, BaseOffset, MorallyVirtual);
     }
   }
@@ -1418,9 +1418,6 @@ class VTTBuilder {
       const CXXRecordDecl *Base =
         cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
       if (i->isVirtual() && !SeenVBase.count(Base)) {
-        // Remember the sub-VTT index.
-        SubVTTIndicies[Base] = Inits.size();
-
         SeenVBase.insert(Base);
         uint64_t BaseOffset = BLayout.getVBaseClassOffset(Base);
         BuildVTT(Base, BaseOffset, true);