1 files changed, 11 insertions, 6 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index bb22ebc037..7ee19ebf39 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -857,25 +857,30 @@ void VtableBuilder::AppendMethodsToVtable() {
                                          VirtualAdjustment);
     }
 
+    llvm::Constant *Method = 0;
     if (!ReturnAdjustment.isEmpty()) {
       // Build a covariant thunk.
       CovariantThunkAdjustment Adjustment(ThisAdjustment, ReturnAdjustment);
-      submethods[i] = CGM.BuildCovariantThunk(MD, Extern, Adjustment);
+      Method = CGM.BuildCovariantThunk(MD, Extern, Adjustment);
     } else if (!ThisAdjustment.isEmpty()) {
       // Build a "regular" thunk.
-      submethods[i] = CGM.BuildThunk(GD, Extern, ThisAdjustment);
+      Method = CGM.BuildThunk(GD, Extern, ThisAdjustment);
     } else if (MD->isPure()) {
       // We have a pure virtual method.
-      submethods[i] = getPureVirtualFn();
+      Method = getPureVirtualFn();
+    } else {
+      // We have a good old regular method.
+      Method = WrapAddrOf(GD);
     }
+
+    // Add the method to the vtable.
+    methods.push_back(Method);
   }
   
+  
   ThisAdjustments.clear();
   BaseReturnTypes.clear();
   
-  D1(printf("============= combining methods\n"));
-  methods.insert(methods.end(), submethods.begin(), submethods.end());
-  
   Methods.clear();
   submethods.clear();
 }