From aaf8acfea1d436b747170f4871c3e48e5879422f Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Fri, 26 Mar 2010 06:35:42 +0000
Subject: Revert r99612 and see if it fixes self-host.

llvm-svn: 99614
---
 clang/lib/CodeGen/CGClass.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'clang/lib/CodeGen/CGClass.cpp')

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 4999d620b5e..8a084926e76 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/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);
     
-- 
cgit v1.2.3