They still FAIL though: FAIL: g++.dg/tree-prof/pr35545.C execution: file pr35545.gcda does not exist, -fprofile-generate -D_PROFILE_GENERATE FAIL: g++.dg/ipa/devirt-42.C -std=gnu++98 scan-tree-dump-times optimized "return 2" 2 FAIL: g++.dg/ipa/devirt-42.C -std=gnu++11 scan-tree-dump-times optimized "return 2" 2 FAIL: g++.dg/ipa/devirt-42.C -std=gnu++1y scan-tree-dump-times optimized "return 2" 2
Honza - please test your patches better. Richard. 2014-10-21 Richard Biener <rguent...@suse.de> * 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. Index: gcc/testsuite/g++.dg/ipa/devirt-42.C =================================================================== --- gcc/testsuite/g++.dg/ipa/devirt-42.C (revision 216506) +++ gcc/testsuite/g++.dg/ipa/devirt-42.C (working copy) @@ -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" } } */ Index: gcc/testsuite/g++.dg/ipa/devirt-46.C =================================================================== --- gcc/testsuite/g++.dg/ipa/devirt-46.C (revision 216506) +++ gcc/testsuite/g++.dg/ipa/devirt-46.C (working copy) @@ -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" } } */ Index: gcc/testsuite/g++.dg/ipa/devirt-47.C =================================================================== --- gcc/testsuite/g++.dg/ipa/devirt-47.C (revision 216506) +++ gcc/testsuite/g++.dg/ipa/devirt-47.C (working copy) @@ -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" } } */ Index: gcc/testsuite/g++.dg/tree-prof/pr35545.C =================================================================== --- gcc/testsuite/g++.dg/tree-prof/pr35545.C (revision 216506) +++ gcc/testsuite/g++.dg/tree-prof/pr35545.C (working copy) @@ -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" } } */