From 0bf4089d190ba80bc2ef5734ab736b6ea6d01fbc Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Fri, 26 Mar 2010 04:13:46 +0000
Subject: [PATCH] Use the new vtable layout code for construction vtables.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99606 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/CodeGen/CGVtable.cpp  | 10 ----------
 utils/VtableTest/Makefile |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 77748a6e78..65788259e6 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -4186,16 +4186,6 @@ CodeGenVTables::GenerateConstructionVTable(const CXXRecordDecl *RD,
                                       const BaseSubobject &Base, 
                                       bool BaseIsVirtual, 
                                       VTableAddressPointsMapTy& AddressPoints) {
-  if (!CGM.getLangOptions().DumpVtableLayouts) {
-    llvm::GlobalVariable *VTable =
-      GenerateVtable(llvm::GlobalValue::InternalLinkage,
-                     /*GenerateDefinition=*/true,
-                     RD, Base.getBase(), Base.getBaseOffset(),
-                     BaseIsVirtual, AddressPoints);
-  
-    return VTable;
-  }
-  
   VtableBuilder Builder(*this, Base.getBase(), Base.getBaseOffset(), 
                         /*MostDerivedClassIsVirtual=*/BaseIsVirtual, RD);
 
diff --git a/utils/VtableTest/Makefile b/utils/VtableTest/Makefile
index dd615aef6a..fc75d1945e 100644
--- a/utils/VtableTest/Makefile
+++ b/utils/VtableTest/Makefile
@@ -1,4 +1,4 @@
-GXX := llvm-g++-4.2
+GXX := g++-4.2
 CLANGXX := clang++
 
 all: one
-- 
2.40.0