Revert r99612 and see if it fixes self-host.

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

diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index 4999d620b5e1f279cd34eff687db2c660bcca356..8a084926e76a5df0e07b6a7d4ca8b47205b4942e 100644 (file)
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -1601,13 +1601,6 @@ void CodeGenFunction::InitializeVtablePtrs(BaseSubobject Base,
     
     CXXRecordDecl *BaseDecl
       = cast<CXXRecordDecl>(I->getType()->getAs<RecordType>()->getDecl());
-
-    // We don't need to initialize vtable pointers for primary bases, unless
-    // they're virtual.
-    if (!Layout.getPrimaryBaseWasVirtual() &&
-        Layout.getPrimaryBase() == BaseDecl)
-      continue;
-
     uint64_t BaseOffset = Base.getBaseOffset() + 
       Layout.getBaseClassOffset(BaseDecl);