[cfe-commits] r99614 - /cfe/trunk/lib/CodeGen/CGClass.cpp

[Anders Carlsson]

Author: andersca
Date: Fri Mar 26 01:35:42 2010
New Revision: 99614

URL: http://llvm.org/viewvc/llvm-project?rev=99614&view=rev
Log:
Revert r99612 and see if it fixes self-host.

Modified:
    cfe/trunk/lib/CodeGen/CGClass.cpp

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=99614&r1=99613&r2=99614&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Fri Mar 26 01:35:42 2010
@@ -1601,13 +1601,6 @@
     
     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);