From: Anders Carlsson <andersca@mac.com>
Date: Fri, 26 Mar 2010 06:35:42 +0000 (+0000)
Subject: Revert r99612 and see if it fixes self-host.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94e8ee520a00dcbdc896df07973d68f5ec7fdac8;p=clang

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 4999d620b5..8a084926e7 100644
--- 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);