devirt-42.C: Fix dump scanning routines.

2014-10-21  Richard Biener  <rguenther@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.

From-SVN: r216509

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 979fe430f8f14b48081fd3952d481e74a18a15b2..920fd48c404dc991bbfb415296c6e7554ef19ec4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-21  Richard Biener  <rguenther@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.
+
 2014-10-21  Jakub Jelinek  <jakub@redhat.com>
 
        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 e5544eff598166ab85da1da7bc9ced5bf7199666..a97a30a5f39b6bbd2564fc83a632da5bd427cfd1 100644 (file)
--- 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 2648fa9cf3aaf23c622c3619e98454a8ed107a6f..bce7109c84d8573c1e8091470ecf53ebb26aea37 100644 (file)
--- 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 364a9ab085eb03aeea7a6a8541a01a8c7b3ad96b..81dc5e69d6d61d2bc13de0d92cd783f559691e31 100644 (file)
--- 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 f5ff8b4bbdf3674eb79c2df24164bd5a754fae9f..8f703a2a005cf5089960708b56dcee9106233e53 100644 (file)
--- 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" } } */