[cfe-commits] r99606 - in /cfe/trunk: lib/CodeGen/CGVtable.cpp utils/VtableTest/Makefile

[Anders Carlsson]

Author: andersca
Date: Thu Mar 25 23:13:46 2010
New Revision: 99606

URL: http://llvm.org/viewvc/llvm-project?rev=99606&view=rev
Log:
Use the new vtable layout code for construction vtables.

Modified:
    cfe/trunk/lib/CodeGen/CGVtable.cpp
    cfe/trunk/utils/VtableTest/Makefile

Modified: cfe/trunk/lib/CodeGen/CGVtable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGVtable.cpp?rev=99606&r1=99605&r2=99606&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGVtable.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGVtable.cpp Thu Mar 25 23:13:46 2010
@@ -4186,16 +4186,6 @@
                                       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);
 

Modified: cfe/trunk/utils/VtableTest/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/VtableTest/Makefile?rev=99606&r1=99605&r2=99606&view=diff
==============================================================================
--- cfe/trunk/utils/VtableTest/Makefile (original)
+++ cfe/trunk/utils/VtableTest/Makefile Thu Mar 25 23:13:46 2010
@@ -1,4 +1,4 @@
-GXX := llvm-g++-4.2
+GXX := g++-4.2
 CLANGXX := clang++
 
 all: one