Start populating the VtableMembers structure.
llvm-svn: 90517
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index 46a0bab..b886084 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -421,7 +421,10 @@
const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl());
- // else allocate a new slot.
+ // We didn't find an entry in the vtable that we could use, add a new
+ // entry.
+ Methods.AddMethod(GD);
+
Index[GD] = submethods.size();
submethods.push_back(m);
D1(printf(" vfn for %s at %d\n", MD->getNameAsString().c_str(),
@@ -553,9 +556,13 @@
methods.push_back(rtti);
Index_t AddressPoint = methods.size();
+ 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();
// and then the non-virtual bases.
@@ -864,6 +871,8 @@
Adjustment.GD = GD;
}
+ Methods.OverrideMethod(OGD, GD);
+
Index[GD] = i;
submethods[i] = m;
if (isPure)