[cfe-commits] r101872 - in /cfe/trunk/lib/CodeGen: CGClass.cpp CodeGenFunction.h

[Anders Carlsson]

Author: andersca
Date: Tue Apr 20 00:22:15 2010
New Revision: 101872

URL: http://llvm.org/viewvc/llvm-project?rev=101872&view=rev
Log:
Pass the nearest virtual base decl to InitializeVTablePointers. No functionality change right now.

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

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=101872&r1=101871&r2=101872&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Tue Apr 20 00:22:15 2010
@@ -1536,7 +1536,7 @@
 
 void
 CodeGenFunction::InitializeVTablePointer(BaseSubobject Base, 
-                                         bool BaseIsMorallyVirtual,
+                                         const CXXRecordDecl *NearestVBase,
                                          llvm::Constant *VTable,
                                          const CXXRecordDecl *VTableClass) {
   const CXXRecordDecl *RD = Base.getBase();
@@ -1546,7 +1546,7 @@
 
   // Check if we need to use a vtable from the VTT.
   if (CodeGenVTables::needsVTTParameter(CurGD) &&
-      (RD->getNumVBases() || BaseIsMorallyVirtual)) {
+      (RD->getNumVBases() || NearestVBase)) {
     // Get the secondary vpointer index.
     uint64_t VirtualPointerIndex = 
      CGM.getVTables().getSecondaryVirtualPointerIndex(VTableClass, Base);
@@ -1567,7 +1567,7 @@
   // Compute where to store the address point.
   llvm::Value *VTableField;
   
-  if (CodeGenVTables::needsVTTParameter(CurGD) && BaseIsMorallyVirtual) {
+  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, 
@@ -1589,7 +1589,7 @@
 
 void
 CodeGenFunction::InitializeVTablePointers(BaseSubobject Base, 
-                                          bool BaseIsMorallyVirtual,
+                                          const CXXRecordDecl *NearestVBase,
                                           bool BaseIsNonVirtualPrimaryBase,
                                           llvm::Constant *VTable,
                                           const CXXRecordDecl *VTableClass,
@@ -1598,7 +1598,7 @@
   // been set.
   if (!BaseIsNonVirtualPrimaryBase) {
     // Initialize the vtable pointer for this base.
-    InitializeVTablePointer(Base, BaseIsMorallyVirtual, VTable, VTableClass);
+    InitializeVTablePointer(Base, NearestVBase, VTable, VTableClass);
   }
   
   const CXXRecordDecl *RD = Base.getBase();
@@ -1614,7 +1614,6 @@
       continue;
 
     uint64_t BaseOffset;
-    bool BaseDeclIsMorallyVirtual = BaseIsMorallyVirtual;
     bool BaseDeclIsNonVirtualPrimaryBase;
 
     if (I->isVirtual()) {
@@ -1626,7 +1625,6 @@
         getContext().getASTRecordLayout(VTableClass);
 
       BaseOffset = Layout.getVBaseClassOffset(BaseDecl);
-      BaseDeclIsMorallyVirtual = true;
       BaseDeclIsNonVirtualPrimaryBase = false;
     } else {
       const ASTRecordLayout &Layout = getContext().getASTRecordLayout(RD);
@@ -1636,7 +1634,7 @@
     }
     
     InitializeVTablePointers(BaseSubobject(BaseDecl, BaseOffset), 
-                             BaseDeclIsMorallyVirtual, 
+                             I->isVirtual() ? BaseDecl : NearestVBase,
                              BaseDeclIsNonVirtualPrimaryBase, 
                              VTable, VTableClass, VBases);
   }
@@ -1652,8 +1650,7 @@
 
   // Initialize the vtable pointers for this class and all of its bases.
   VisitedVirtualBasesSetTy VBases;
-  InitializeVTablePointers(BaseSubobject(RD, 0),
-                           /*BaseIsMorallyVirtual=*/false, 
+  InitializeVTablePointers(BaseSubobject(RD, 0), /*NearestVBase=*/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=101872&r1=101871&r2=101872&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Tue Apr 20 00:22:15 2010
@@ -534,14 +534,14 @@
   /// InitializeVTablePointer - Initialize the vtable pointer of the given
   /// subobject.
   ///
-  /// \param BaseIsMorallyVirtual - Whether the base subobject is a virtual base
-  /// or a direct or indirect base of a virtual base.
-  void InitializeVTablePointer(BaseSubobject Base, bool BaseIsMorallyVirtual,
+  void InitializeVTablePointer(BaseSubobject Base, 
+                               const CXXRecordDecl *NearestVBase,
                                llvm::Constant *VTable,
                                const CXXRecordDecl *VTableClass);
 
   typedef llvm::SmallPtrSet<const CXXRecordDecl *, 4> VisitedVirtualBasesSetTy;
-  void InitializeVTablePointers(BaseSubobject Base, bool BaseIsMorallyVirtual,
+  void InitializeVTablePointers(BaseSubobject Base, 
+                                const CXXRecordDecl *NearestVBase,
                                 bool BaseIsNonVirtualPrimaryBase,
                                 llvm::Constant *VTable,
                                 const CXXRecordDecl *VTableClass,