Add the method directly to the vtable.
llvm-svn: 90531
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index bb22ebc..7ee19eb 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -857,25 +857,30 @@
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();
}