This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch for 3.0 from mainline branch to fix testsuite



Since I didn't get a reply to my last email, I'm asking again.  The
testsuite runs on the two branches differ significantly since
g++.dg/vtgc1.C fails on the release branch but not on the mainline
branch.  Geoff fixed it on the mainline branch but so far not on the
release branch.

I'd like to commit Geoff's patch (appended below for reference) to the
release branch.  Is that ok?

Andreas

Andreas Jaeger <aj@suse.de> writes:


> Geoffrey Keating <geoffk@thief.cygnus.com> writes:
> 
> > The g++.dg/vtgc1.C testcase was failing when Mark removed -fno-new-abi
> > support, because it relied on it.  This patch updates it for the new
> > ABI.  I'll commit it shortly.
> 
> Geoff, can you apply this also to the release branch?  On the release
> branch I still see these failures which don't exist (thanks to your
> patch) on the mainline:
> 
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multivv3 virtual table, 0
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multivv3::Side0 virtual table, Side0 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multivv3::Base2 virtual table, Base2 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multiss2 virtual table, Base2 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multiss2::Side0 virtual table, Side0 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multivs1 virtual table, Base2 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multivs1::Side0 virtual table, Side0 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multisv0 virtual table, Side0 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Multisv0::Base2 virtual table, Base2 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Side0 virtual table, 0
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*VbasedA virtual table, 0
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*VbasedA::Base2 virtual table, Base2 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Base2 virtual table, Base1 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Base1 virtual table, Base0 virtual table
> FAIL: g++.dg/vtgc1.C scan-assembler .vtable_inherit[    ]*Base0 virtual table, 0
> 
> Thanks,
> Andreas
> 
> 
> 

2001-02-12  Geoffrey Keating  <geoffk@redhat.com>

	* g++.dg/vtgc1.C: Update for new ABI.


--- gcc/gcc/testsuite/g++.dg/vtgc1.C	Tue Feb 13 08:39:26 2001
+++ gcc-3_0-branch/gcc/testsuite/g++.dg/vtgc1.C	Fri Dec 29 03:57:08 2000
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-fvtable-gc" }
+// { dg-options "-fvtable-gc -fno-new-abi" }
 // Origin: Hans-Peter Nilsson <hp@bitrange.com>
 
 class Base0
@@ -118,16 +118,18 @@
 void x4 (Multiss2 *ii) { ii->f2();}
 void x5 (Multivv3 *ii) { ii->f2();}
 
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Multivv3, 0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VTT for Multivv3, 0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Multiss2, vtable for Base2" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Multivs1, vtable for Base2" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VTT for Multivs1, vtable for Base2" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Multisv0, vtable for Side0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VTT for Multisv0, vtable for Side0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Side0, 0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for VbasedA, 0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VTT for VbasedA, 0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Base2, vtable for Base1" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Base1, vtable for Base0" } }
-// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*vtable for Base0, 0" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multivv3 virtual table, 0" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multivv3::Side0 virtual table, Side0 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multivv3::Base2 virtual table, Base2 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multiss2 virtual table, Base2 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multiss2::Side0 virtual table, Side0 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multivs1 virtual table, Base2 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multivs1::Side0 virtual table, Side0 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multisv0 virtual table, Side0 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Multisv0::Base2 virtual table, Base2 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Side0 virtual table, 0" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VbasedA virtual table, 0" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*VbasedA::Base2 virtual table, Base2 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Base2 virtual table, Base1 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Base1 virtual table, Base0 virtual table" } }
+// { dg-final { scan-assembler-dem vtgc1.C "\.vtable_inherit\[ \t\]*Base0 virtual table, 0" } }

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]