From 8177d8572a14675cea3e2abf2b639de0457cc697 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Tue, 14 Jun 2011 20:26:08 +0000 Subject: [PATCH] re PR testsuite/48727 (FAIL: g++.dg/opt/devirt2.C scan-assembler-times xyzzy 2) 2011-06-14 Steve Ellcey PR testsuite/48727 * g++.dg/opt/devirt2.C: Fix scan rules for ia64*-*-hpux* and hppa*-*-*. From-SVN: r175055 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/opt/devirt2.C | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c053a553251..a6a63fcd967 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-06-14 Steve Ellcey + + PR testsuite/48727 + * g++.dg/opt/devirt2.C: Fix scan rules for ia64*-*-hpux* and hppa*-*-*. + 2011-06-14 Janis Johnson * gcc.target/arm/pr45701-1.c: Require thumb support. diff --git a/gcc/testsuite/g++.dg/opt/devirt2.C b/gcc/testsuite/g++.dg/opt/devirt2.C index 087dd179115..94a6db8440e 100644 --- a/gcc/testsuite/g++.dg/opt/devirt2.C +++ b/gcc/testsuite/g++.dg/opt/devirt2.C @@ -1,6 +1,10 @@ // { dg-do compile } // { dg-options "-O2" } -// { dg-final { scan-assembler-times "xyzzy" 2 } } +// 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 "br\[^\n\]*xyzzy" 2 { target ia64*-*-hpux* } } } +// { dg-final { scan-assembler-times "xyzzy\[^\n\]*,%r" 2 { target hppa*-*-* } } } struct S { S(); virtual void xyzzy(); }; struct R { int a; S s; R(); }; -- 2.30.2