commit 65d87222b2af0e556f872fecc1b4a82e23e22fb4
author Eli Friedman <eli.friedman@gmail.com> Fri Dec 04 08:52:11 2009 +0000
committer Eli Friedman <eli.friedman@gmail.com> Fri Dec 04 08:52:11 2009 +0000
tree 4909da55bf809bbfc7a457ad9c522a027cb59223
parent 1602277b70ff1b7d1177f2c4da6c64e718f72608

Minor cleanup; no functionality change.

llvm-svn: 90565

clang/lib/CodeGen/CGVtable.cpp

diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 6a03aea..96e5fc5 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -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",