From cca0f8ca9af57b295e6a7ae26ff7491016a7c00c Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Sat, 31 Jan 2015 10:52:20 +0100
Subject: [PATCH] pr64146.C (dg-final): Cleanup icf ipa dump.

	* g++.dg/ipa/pr64146.C (dg-final): Cleanup icf ipa dump.
	* gcc.target/i386/chkp-builtins-1.c (dg-final): Cleanup chkp tree dump.
	* gcc.target/i386/chkp-builtins-2.c (dg-final): Ditto.
	* gcc.target/i386/chkp-builtins-3.c (dg-final): Ditto.
	* gcc.target/i386/chkp-builtins-4.c (dg-final): Ditto.
	* gcc.target/i386/chkp-const-check-1.c (dg-final): Cleanup chkopt
	tree dump.
	* gcc.target/i386/chkp-lifetime-1.c (dg-final): Ditto.
	* gcc.target/i386/chkp-remove-bndint-1.c (dg-final): Cleanup optimized
	tree dump.
	* gcc.target/i386/chkp-remove-bndint-2.c (dg-final): Ditto.
	* gfortran.dg/goacc/private-1.f95 (dg-final): Cleanup omplower
	tree dump.

From-SVN: r220303
---
 gcc/testsuite/ChangeLog                          | 16 ++++++++++++++++
 gcc/testsuite/g++.dg/ipa/pr64146.C               |  1 +
 gcc/testsuite/gcc.target/i386/chkp-builtins-1.c  |  1 +
 gcc/testsuite/gcc.target/i386/chkp-builtins-2.c  |  1 +
 gcc/testsuite/gcc.target/i386/chkp-builtins-3.c  |  1 +
 gcc/testsuite/gcc.target/i386/chkp-builtins-4.c  |  1 +
 .../gcc.target/i386/chkp-const-check-1.c         |  2 +-
 gcc/testsuite/gcc.target/i386/chkp-lifetime-1.c  |  1 +
 .../gcc.target/i386/chkp-remove-bndint-1.c       |  2 +-
 .../gcc.target/i386/chkp-remove-bndint-2.c       |  2 +-
 gcc/testsuite/gfortran.dg/goacc/private-1.f95    |  1 +
 11 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b7f46e4581c..9f48c9db677 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2015-01-31  Uros Bizjak  <ubizjak@gmail.com>
+
+	* g++.dg/ipa/pr64146.C (dg-final): Cleanup icf ipa dump.
+	* gcc.target/i386/chkp-builtins-1.c (dg-final): Cleanup chkp tree dump.
+	* gcc.target/i386/chkp-builtins-2.c (dg-final): Ditto.
+	* gcc.target/i386/chkp-builtins-3.c (dg-final): Ditto.
+	* gcc.target/i386/chkp-builtins-4.c (dg-final): Ditto.
+	* gcc.target/i386/chkp-const-check-1.c (dg-final): Cleanup chkopt
+	tree dump.
+	* gcc.target/i386/chkp-lifetime-1.c (dg-final): Ditto.
+	* gcc.target/i386/chkp-remove-bndint-1.c (dg-final): Cleanup optimized
+	tree dump.
+	* gcc.target/i386/chkp-remove-bndint-2.c (dg-final): Ditto.
+	* gfortran.dg/goacc/private-1.f95 (dg-final): Cleanup omplower
+	tree dump.
+
 2015-01-30  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/64688
diff --git a/gcc/testsuite/g++.dg/ipa/pr64146.C b/gcc/testsuite/g++.dg/ipa/pr64146.C
index 8a2b947a215..bdadfbef8b2 100644
--- a/gcc/testsuite/g++.dg/ipa/pr64146.C
+++ b/gcc/testsuite/g++.dg/ipa/pr64146.C
@@ -36,3 +36,4 @@ int main (int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump-times "Declaration does not bind to currect definition." 2 "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 2" "icf"  } } */
+/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.target/i386/chkp-builtins-1.c b/gcc/testsuite/gcc.target/i386/chkp-builtins-1.c
index 2acc087e62a..299d0b031e9 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-builtins-1.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-builtins-1.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_init_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
diff --git a/gcc/testsuite/gcc.target/i386/chkp-builtins-2.c b/gcc/testsuite/gcc.target/i386/chkp-builtins-2.c
index dc62238c5bd..a8b3754b3f9 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-builtins-2.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-builtins-2.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_copy_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p, void *q)
diff --git a/gcc/testsuite/gcc.target/i386/chkp-builtins-3.c b/gcc/testsuite/gcc.target/i386/chkp-builtins-3.c
index 055f0ed07d9..6f084ee260b 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-builtins-3.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-builtins-3.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_set_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
diff --git a/gcc/testsuite/gcc.target/i386/chkp-builtins-4.c b/gcc/testsuite/gcc.target/i386/chkp-builtins-4.c
index 434df78ac34..21fb36fa618 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-builtins-4.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-builtins-4.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_null_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
diff --git a/gcc/testsuite/gcc.target/i386/chkp-const-check-1.c b/gcc/testsuite/gcc.target/i386/chkp-const-check-1.c
index 53e08289516..abbbd4347bc 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-const-check-1.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-const-check-1.c
@@ -3,7 +3,7 @@
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-chkpopt" } */
 /* { dg-final { scan-tree-dump-not "bndcl" "chkpopt" } } */
 /* { dg-final { scan-tree-dump-not "bndcu" "chkpopt" } } */
-
+/* { dg-final { cleanup-tree-dump "chkpopt" } } */
 
 int test (int *p)
 {
diff --git a/gcc/testsuite/gcc.target/i386/chkp-lifetime-1.c b/gcc/testsuite/gcc.target/i386/chkp-lifetime-1.c
index 5ceaa8e4621..c1becf71322 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-lifetime-1.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-lifetime-1.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-chkpopt-details" } */
 /* { dg-final { scan-tree-dump "Moving creation of \[^ \]+ down to its use" "chkpopt" } } */
+/* { dg-final { cleanup-tree-dump "chkpopt" } } */
 
 extern int arr[];
 
diff --git a/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-1.c b/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-1.c
index 377f5c47164..47cc7359868 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-1.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-1.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-not "bndint" "optimized" } } */
-
+/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 struct S
 {
diff --git a/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-2.c b/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-2.c
index 3547035785e..b34de88f3f9 100644
--- a/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-2.c
+++ b/gcc/testsuite/gcc.target/i386/chkp-remove-bndint-2.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-optimized -Wchkp" } */
 /* { dg-final { scan-tree-dump-not "bndint" "optimized" } } */
-
+/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 struct S
 {
diff --git a/gcc/testsuite/gfortran.dg/goacc/private-1.f95 b/gcc/testsuite/gfortran.dg/goacc/private-1.f95
index 23ce95ad8d2..8bbe4702faf 100644
--- a/gcc/testsuite/gfortran.dg/goacc/private-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/private-1.f95
@@ -35,3 +35,4 @@ end program test
 ! { dg-final { scan-tree-dump-times "private\\(i\\)" 3 "omplower" } }
 ! { dg-final { scan-tree-dump-times "private\\(j\\)" 2 "omplower" } }
 ! { dg-final { scan-tree-dump-times "private\\(k\\)" 1 "omplower" } }
+! { dg-final { cleanup-tree-dump "omplower" } }
-- 
2.30.2