Flip the switch to always get vtables from the VTT when necessary, I've verified that clang bootstraps with this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99800 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index dfad33c..ebefba2 100644
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -1565,12 +1565,9 @@
// Compute the address point.
llvm::Value *VTableAddressPoint;
-
- // FIXME: Always use the new vtable code once we know it works.
- bool UseNewVTableCode = CGM.getLangOptions().DumpVtableLayouts;
-
+
// Check if we need to use a vtable from the VTT.
- if (UseNewVTableCode && CodeGenVTables::needsVTTParameter(CurGD) &&
+ if (CodeGenVTables::needsVTTParameter(CurGD) &&
(RD->getNumVBases() || BaseIsMorallyVirtual)) {
// Get the secondary vpointer index.
uint64_t VirtualPointerIndex =
@@ -1592,8 +1589,7 @@
// Compute where to store the address point.
llvm::Value *VTableField;
- if (UseNewVTableCode &&
- CodeGenVTables::needsVTTParameter(CurGD) && BaseIsMorallyVirtual) {
+ if (CodeGenVTables::needsVTTParameter(CurGD) && BaseIsMorallyVirtual) {
// We need to use the virtual base offset offset because the virtual base
// might have a different offset in the most derived class.
VTableField = GetAddressOfBaseClass(LoadCXXThis(), VTableClass, RD,