Factor appending methods to a vtable out into a separate function.
llvm-svn: 90525
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index c8d4a73..92c4911 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -288,6 +288,9 @@
bool MorallyVirtual, Index_t OverrideOffset,
Index_t Offset, int64_t CurrentVBaseOffset);
+ /// AppendMethods - Append the current methods to the vtable.
+ void AppendMethods();
+
void InstallThunks() {
for (BaseReturnTypesMapTy::const_iterator i = BaseReturnTypes.begin(),
e = BaseReturnTypes.end(); i != e; ++i) {
@@ -537,12 +540,7 @@
assert(submethods.size() == Methods.size() && "Method size mismatch!");
- InstallThunks();
- D1(printf("============= combining methods\n"));
- methods.insert(methods.end(), submethods.begin(), submethods.end());
-
- Methods.clear();
- submethods.clear();
+ AppendMethods();
// and then the non-virtual bases.
NonVirtualBases(RD, Layout, PrimaryBase, PrimaryBaseWasVirtual,
@@ -907,6 +905,15 @@
return false;
}
+void VtableBuilder::AppendMethods() {
+ InstallThunks();
+ D1(printf("============= combining methods\n"));
+ methods.insert(methods.end(), submethods.begin(), submethods.end());
+
+ Methods.clear();
+ submethods.clear();
+}
+
void CGVtableInfo::ComputeMethodVtableIndices(const CXXRecordDecl *RD) {
// Itanium C++ ABI 2.5.2: