Patchwork [testsuite] Fix g++.dg/opt/devirt2.C scanning, PR 48727

login
register
mail settings
Submitter Steve Ellcey
Date June 16, 2011, 8:38 p.m.
Message ID <1308256680.10986.95.camel@hpsje.cup.hp.com>
Download mbox | patch
Permalink /patch/100719/
State New
Headers show

Comments

Steve Ellcey - June 16, 2011, 8:38 p.m.
On Wed, 2011-06-15 at 12:51 -0400, Hans-Peter Nilsson wrote:
> On Fri, 10 Jun 2011, Steve Ellcey wrote:
> 
> > I will check in this testsuite fix as obvious if there are no objections.
> 
> But... :)

> JFTR, if you want this to be really right, you should not xfail
> this part of the test but rather skip it, as the test is at
> fault, not the targets/gcc.  If think it'd be:
> 
> // { dg-final { scan-assembler-times "xyzzy" 2 { target { ! { hppa*-*-* ia64*-*-* } } } } }
> 
> 
> > +// { dg-final { scan-assembler-times "br\[^\n\]*xyzzy"  2 { target ia64*-*-* } } }
> > +// { dg-final { scan-assembler-times "xyzzy\[^\n\]*,%r"  2 { target hppa*-*-* } } }
> >
> >  struct S { S(); virtual void xyzzy(); };
> >  struct R { int a; S s; R(); };
> >
> 
> brgds, H-P

You are right, and I am going to check in this change as obvious.
I have tested it to make sure it works.

Steve Ellcey
sje@cup.hp.com


2011-06-16  Steve Ellcey  <sje@cup.hp.com>

        PR testsuite/48727
        * g++.dg/opt/devirt2.C: Change xfail rule to target.

Patch

Index: g++.dg/opt/devirt2.C
===================================================================
--- g++.dg/opt/devirt2.C        (revision 175089)
+++ g++.dg/opt/devirt2.C        (working copy)
@@ -2,7 +2,7 @@ 
 // { dg-options "-O2" }
 // The IA64 and HPPA compilers generate external declarations in addition
 // to the call so those scans need to be more specific.
-// { dg-final { scan-assembler-times "xyzzy" 2 { xfail hppa*-*-* ia64*-*-hpux* } } }
+// { dg-final { scan-assembler-times "xyzzy" 2 { target { ! { hppa*-*-* ia64*-*-hpux* } } } } }
 // { dg-final { scan-assembler-times "br\[^\n\]*xyzzy"  2 { target ia64*-*-hpux* } } }
 // { dg-final { scan-assembler-times "xyzzy\[^\n\]*,%r"  2 { target hppa*-*-* } } }