Refactor a bit.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85424 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 66f48c0e3d9c195f113c75bb6f2916647c8df3c0..3962ecdc387d747adee0654955d354cd3085dc9f 100644 (file)
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -509,15 +509,7 @@ public:
     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);