[cfe-commits] r90565 - /cfe/trunk/lib/CodeGen/CGVtable.cpp

[Eli Friedman]

Author: efriedma
Date: Fri Dec  4 02:52:11 2009
New Revision: 90565

URL: http://llvm.org/viewvc/llvm-project?rev=90565&view=rev
Log:
Minor cleanup; no functionality change.


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

Modified: cfe/trunk/lib/CodeGen/CGVtable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVtable.cpp?rev=90565&r1=90564&r2=90565&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Fri Dec  4 02:52:11 2009
@@ -506,17 +506,11 @@
     const bool PrimaryBaseWasVirtual = Layout.getPrimaryBaseWasVirtual();
 
     // vtables are composed from the chain of primaries.
-    if (PrimaryBase) {
+    if (PrimaryBase && !PrimaryBaseWasVirtual) {
       D1(printf(" doing primaries for %s most derived %s\n",
                 RD->getNameAsCString(), Class->getNameAsCString()));
-      
-      int BaseCurrentVBaseOffset = CurrentVBaseOffset;
-      if (PrimaryBaseWasVirtual)
-        BaseCurrentVBaseOffset = BLayout.getVBaseClassOffset(PrimaryBase);
-        
-      if (!PrimaryBaseWasVirtual)
-        Primaries(PrimaryBase, PrimaryBaseWasVirtual|MorallyVirtual, Offset,
-                  updateVBIndex, current_vbindex, BaseCurrentVBaseOffset);
+      Primaries(PrimaryBase, PrimaryBaseWasVirtual|MorallyVirtual, Offset,
+                updateVBIndex, current_vbindex, CurrentVBaseOffset);
     }
 
     D1(printf(" doing vcall entries for %s most derived %s\n",