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

[Mike Stump]

Author: mrs
Date: Wed Oct 28 15:44:03 2009
New Revision: 85424

URL: http://llvm.org/viewvc/llvm-project?rev=85424&view=rev
Log:
Refactor a bit.

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=85424&r1=85423&r2=85424&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Wed Oct 28 15:44:03 2009
@@ -509,15 +509,7 @@
     if (ForVirtualBase)
       extra = offsets.size();
 
-    // vtables are composed from the chain of primaries.
-    if (PrimaryBase) {
-      if (PrimaryBaseWasVirtual)
-        IndirectPrimary.insert(PrimaryBase);
-      Primaries(PrimaryBase, PrimaryBaseWasVirtual|MorallyVirtual, Offset);
-    }
-
-    // And add the virtuals for the class to the primary vtable.
-    AddMethods(RD, MorallyVirtual, Offset);
+    Primaries(RD, MorallyVirtual, Offset);
 
     if (Path)
       OverrideMethods(Path, MorallyVirtual, Offset);