aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/CGVtable.cpp10
-rw-r--r--utils/VtableTest/Makefile2
2 files changed, 1 insertions, 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