[cfe-commits] r101921 - in /cfe/trunk: lib/CodeGen/CGClass.cpp lib/CodeGen/CodeGenFunction.h test/CodeGenCXX/vtable-pointer-initialization.cpp

[Anders Carlsson]

Author: andersca
Date: Tue Apr 20 13:05:10 2010
New Revision: 101921

URL: http://llvm.org/viewvc/llvm-project?rev=101921&view=rev
Log:
Back out r101911 and see if it makes the bots happy.

Modified:
    cfe/trunk/lib/CodeGen/CGClass.cpp
    cfe/trunk/lib/CodeGen/CodeGenFunction.h
    cfe/trunk/test/CodeGenCXX/vtable-pointer-initialization.cpp

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=101921&r1=101920&r2=101921&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Tue Apr 20 13:05:10 2010
@@ -1549,7 +1549,6 @@
 void
 CodeGenFunction::InitializeVTablePointer(BaseSubobject Base, 
                                          const CXXRecordDecl *NearestVBase,
-                                         uint64_t BaseOffsetFromNearestVBase,
                                          llvm::Constant *VTable,
                                          const CXXRecordDecl *VTableClass) {
   const CXXRecordDecl *RD = Base.getBase();
@@ -1577,31 +1576,21 @@
       Builder.CreateConstInBoundsGEP2_64(VTable, 0, AddressPoint);
   }
 
-  llvm::Value *VTableField = LoadCXXThis();
-
   // Compute where to store the address point.
-  uint64_t NonVirtualOffset = BaseOffsetFromNearestVBase;
-
-  llvm::Value *VirtualOffset = 0;
-  if (NearestVBase) {
-    if (!CodeGenVTables::needsVTTParameter(CurGD)) {
-      // Just get the vbase offset in the complete class.
-      const ASTRecordLayout &Layout = 
-        getContext().getASTRecordLayout(VTableClass);
-
-      NonVirtualOffset += Layout.getVBaseClassOffset(NearestVBase);
-    } else {
-      // We need to use the virtual base offset offset because the virtual base
-      // might have a different offset in the most derived class.
-      VirtualOffset = GetVirtualBaseClassOffset(VTableField,
-                                                VTableClass, NearestVBase);
-    }
-  }
+  llvm::Value *VTableField;
+  
+  if (CodeGenVTables::needsVTTParameter(CurGD) && NearestVBase) {
+    // We need to use the virtual base offset offset because the virtual base
+    // might have a different offset in the most derived class.
+    VTableField = GetAddressOfBaseClass(LoadCXXThis(), VTableClass, RD, 
+                                        /*NullCheckValue=*/false);
+  } else {
+    const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(CGM.getLLVMContext());
 
-  if (NonVirtualOffset || VirtualOffset)
+    VTableField = Builder.CreateBitCast(LoadCXXThis(), Int8PtrTy);
     VTableField = 
-      ApplyNonVirtualAndVirtualOffset(*this, VTableField,
-                                      NonVirtualOffset, VirtualOffset);
+      Builder.CreateConstInBoundsGEP1_64(VTableField, Base.getBaseOffset() / 8);  
+  }
 
   // Finally, store the address point.
   const llvm::Type *AddressPointPtrTy =
@@ -1613,7 +1602,6 @@
 void
 CodeGenFunction::InitializeVTablePointers(BaseSubobject Base, 
                                           const CXXRecordDecl *NearestVBase,
-                                          uint64_t BaseOffsetFromNearestVBase,
                                           bool BaseIsNonVirtualPrimaryBase,
                                           llvm::Constant *VTable,
                                           const CXXRecordDecl *VTableClass,
@@ -1622,8 +1610,7 @@
   // been set.
   if (!BaseIsNonVirtualPrimaryBase) {
     // Initialize the vtable pointer for this base.
-    InitializeVTablePointer(Base, NearestVBase, BaseOffsetFromNearestVBase,
-                            VTable, VTableClass);
+    InitializeVTablePointer(Base, NearestVBase, VTable, VTableClass);
   }
   
   const CXXRecordDecl *RD = Base.getBase();
@@ -1660,7 +1647,6 @@
     
     InitializeVTablePointers(BaseSubobject(BaseDecl, BaseOffset), 
                              I->isVirtual() ? BaseDecl : NearestVBase,
-                             I->isVirtual() ? 0 : BaseOffsetFromNearestVBase,
                              BaseDeclIsNonVirtualPrimaryBase, 
                              VTable, VTableClass, VBases);
   }
@@ -1677,7 +1663,6 @@
   // Initialize the vtable pointers for this class and all of its bases.
   VisitedVirtualBasesSetTy VBases;
   InitializeVTablePointers(BaseSubobject(RD, 0), /*NearestVBase=*/0, 
-                           /*BaseOffsetFromNearestVBase=*/0,
                            /*BaseIsNonVirtualPrimaryBase=*/false, 
                            VTable, RD, VBases);
 }

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=101921&r1=101920&r2=101921&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Tue Apr 20 13:05:10 2010
@@ -536,14 +536,12 @@
   ///
   void InitializeVTablePointer(BaseSubobject Base, 
                                const CXXRecordDecl *NearestVBase,
-                               uint64_t BaseOffsetFromNearestVBase,
                                llvm::Constant *VTable,
                                const CXXRecordDecl *VTableClass);
 
   typedef llvm::SmallPtrSet<const CXXRecordDecl *, 4> VisitedVirtualBasesSetTy;
   void InitializeVTablePointers(BaseSubobject Base, 
                                 const CXXRecordDecl *NearestVBase,
-                                uint64_t BaseOffsetFromNearestVBase,
                                 bool BaseIsNonVirtualPrimaryBase,
                                 llvm::Constant *VTable,
                                 const CXXRecordDecl *VTableClass,

Modified: cfe/trunk/test/CodeGenCXX/vtable-pointer-initialization.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/vtable-pointer-initialization.cpp?rev=101921&r1=101920&r2=101921&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/vtable-pointer-initialization.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/vtable-pointer-initialization.cpp Tue Apr 20 13:05:10 2010
@@ -55,23 +55,3 @@
 // CHECK: store i8** getelementptr inbounds ([3 x i8*]* @_ZTV1B, i64 0, i64 2)
 // CHECK: call void @_ZN5FieldC1Ev
 // CHECK: ret void
-
-namespace Test1 {
-
-// Test that we don't assert when initializing the vtable pointers in C.
-struct A {
-  virtual void a();
-  int i;
-};
-
-struct B : virtual A {
-  virtual void b();
-};
-
-struct C : A, virtual B {
-  virtual void c();
-  C();
-};
-
-C::C() { }
-}