From 1994d041775c5735ab605c05a62d9276f67fa1fd Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 21 Oct 2014 12:30:18 +0000 Subject: [PATCH] devirt-42.C: Fix dump scanning routines. 2014-10-21 Richard Biener * g++.dg/ipa/devirt-42.C: Fix dump scanning routines. * g++.dg/ipa/devirt-46.C: Likewise. * g++.dg/ipa/devirt-47.C: Likewise. * g++.dg/tree-prof/pr35545.C: Likewise. From-SVN: r216509 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/ipa/devirt-42.C | 6 +++--- gcc/testsuite/g++.dg/ipa/devirt-46.C | 6 +++--- gcc/testsuite/g++.dg/ipa/devirt-47.C | 6 +++--- gcc/testsuite/g++.dg/tree-prof/pr35545.C | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 979fe430f8f..920fd48c404 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-10-21 Richard Biener + + * g++.dg/ipa/devirt-42.C: Fix dump scanning routines. + * g++.dg/ipa/devirt-46.C: Likewise. + * g++.dg/ipa/devirt-47.C: Likewise. + * g++.dg/tree-prof/pr35545.C: Likewise. + 2014-10-21 Jakub Jelinek PR tree-optimization/63563 diff --git a/gcc/testsuite/g++.dg/ipa/devirt-42.C b/gcc/testsuite/g++.dg/ipa/devirt-42.C index e5544eff598..a97a30a5f39 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-42.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-42.C @@ -31,8 +31,8 @@ main() /* { dg-final { scan-ipa-dump-times "Discovered a virtual call to a known target" 2 "inline" } } */ /* Verify that speculation is optimized by late optimizers. */ -/* { dg-final { scan-ipa-dump-times "return 2" 2 "optimized" } } */ -/* { dg-final { scan-ipa-dump-not "OBJ_TYPE_REF" "optimized" } } */ +/* { dg-final { scan-tree-dump-times "return 2" 2 "optimized" } } */ +/* { dg-final { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */ /* { dg-final { cleanup-ipa-dump "inline" } } */ -/* { dg-final { cleanup-ipa-dump "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-46.C b/gcc/testsuite/g++.dg/ipa/devirt-46.C index 2648fa9cf3a..bce7109c84d 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-46.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-46.C @@ -21,7 +21,7 @@ m() } /* { dg-final { scan-ipa-dump-times "Discovered a virtual call to a known target\[^\\n\]*B::foo" 1 "inline" } } */ -/* { dg-final { scan-ipa-dump-not "OBJ_TYPE_REF" "optimized" } } */ -/* { dg-final { scan-ipa-dump-not "abort" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "abort" "optimized" } } */ /* { dg-final { cleanup-ipa-dump "inline" } } */ -/* { dg-final { cleanup-ipa-dump "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/g++.dg/ipa/devirt-47.C b/gcc/testsuite/g++.dg/ipa/devirt-47.C index 364a9ab085e..81dc5e69d6d 100644 --- a/gcc/testsuite/g++.dg/ipa/devirt-47.C +++ b/gcc/testsuite/g++.dg/ipa/devirt-47.C @@ -24,8 +24,8 @@ m() } /* { dg-final { scan-ipa-dump-times "Discovered a virtual call to a known target\[^\\n\]*C::_ZTh" 1 "inline" } } */ -/* { dg-final { scan-ipa-dump-not "OBJ_TYPE_REF" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */ /* FIXME: We ought to inline thunk. */ -/* { dg-final { scan-ipa-dump "C::_ZThn" "optimized" } } */ +/* { dg-final { scan-tree-dump "C::_ZThn" "optimized" } } */ /* { dg-final { cleanup-ipa-dump "inline" } } */ -/* { dg-final { cleanup-ipa-dump "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/g++.dg/tree-prof/pr35545.C b/gcc/testsuite/g++.dg/tree-prof/pr35545.C index f5ff8b4bbdf..8f703a2a005 100644 --- a/gcc/testsuite/g++.dg/tree-prof/pr35545.C +++ b/gcc/testsuite/g++.dg/tree-prof/pr35545.C @@ -48,5 +48,5 @@ int main() } /* { dg-final-use { scan-ipa-dump "Indirect call -> direct call" "profile_estimate" } } */ /* { dg-final-use { cleanup-ipa-dump "profile" } } */ -/* { dg-final-use { scan-ipa-dump-not "OBJ_TYPE_REF" "optimized" } } */ +/* { dg-final-use { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */ /* { dg-final-use { cleanup-tree-dump "optimized" } } */ -- 2.30.2