* g++.dg/tree-ssa/pr18178.C, gcc.dg/tree-ssa/20030821-1.c,

	gcc.dg/tree-ssa/20050314-1.c, gcc.dg/tree-ssa/alias-1.c,
	gcc.dg/tree-ssa/phi-opt-1.c, gcc.dg/tree-ssa/phi-opt-2.c,
	gcc.dg/tree-ssa/phi-opt-3.c, gcc.dg/tree-ssa/phi-opt-4.c,
	gcc.dg/tree-ssa/phi-opt-5.c, gcc.dg/tree-ssa/pr18133-1.c,
	gcc.dg/tree-ssa/pr18133-2.c, gcc.dg/tree-ssa/pr18134.c,
	gcc.dg/tree-ssa/pr20470.c, gcc.dg/tree-ssa/pr20657.c,
	gcc.dg/tree-ssa/pr20702.c, gcc.dg/tree-ssa/pr20913.c,
	gcc.dg/tree-ssa/pr21001.c, gcc.dg/tree-ssa/stdarg-1.c,
	gcc.dg/tree-ssa/stdarg-2.c, gcc.dg/tree-ssa/stdarg-3.c,
	gcc.dg/tree-ssa/stdarg-4.c, gcc.dg/tree-ssa/stdarg-5.c,
	gcc.dg/tree-ssa/structopt-1.c, gcc.dg/tree-ssa/structopt-2.c,
	gcc.dg/tree-ssa/structopt-3.c: Use cleanup-tree-dump.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98928 138bc75d-0d04-0410-961f-82ee72b054a4

26 files changed, 41 insertions, 5 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0d418527f79..f02ae0f5427 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2005-04-28  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* g++.dg/tree-ssa/pr18178.C, gcc.dg/tree-ssa/20030821-1.c,
+	gcc.dg/tree-ssa/20050314-1.c, gcc.dg/tree-ssa/alias-1.c,
+	gcc.dg/tree-ssa/phi-opt-1.c, gcc.dg/tree-ssa/phi-opt-2.c,
+	gcc.dg/tree-ssa/phi-opt-3.c, gcc.dg/tree-ssa/phi-opt-4.c,
+	gcc.dg/tree-ssa/phi-opt-5.c, gcc.dg/tree-ssa/pr18133-1.c,
+	gcc.dg/tree-ssa/pr18133-2.c, gcc.dg/tree-ssa/pr18134.c,
+	gcc.dg/tree-ssa/pr20470.c, gcc.dg/tree-ssa/pr20657.c,
+	gcc.dg/tree-ssa/pr20702.c, gcc.dg/tree-ssa/pr20913.c,
+	gcc.dg/tree-ssa/pr21001.c, gcc.dg/tree-ssa/stdarg-1.c,
+	gcc.dg/tree-ssa/stdarg-2.c, gcc.dg/tree-ssa/stdarg-3.c,
+	gcc.dg/tree-ssa/stdarg-4.c, gcc.dg/tree-ssa/stdarg-5.c,
+	gcc.dg/tree-ssa/structopt-1.c, gcc.dg/tree-ssa/structopt-2.c,
+	gcc.dg/tree-ssa/structopt-3.c: Use cleanup-tree-dump.
+
 2005-04-28  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR fortran/20865
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr18178.C b/gcc/testsuite/g++.dg/tree-ssa/pr18178.C
index fd1777ad013..430a625f75d 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr18178.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr18178.C
@@ -44,3 +44,4 @@ void doit (array *a)
 /* VRP should remove all but 1 if() in the loop.  */
 
 /* { dg-final { scan-tree-dump-times "if " 1 "vrp"} } */
+/* { dg-final { cleanup-tree-dump "vrp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
index 08062ef1e44..c92e22862eb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
@@ -24,3 +24,4 @@ y: ;
 
 /* We should have folded away the goto &x  */
 /* { dg-final { scan-tree-dump-times "goto &x" 0 "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
index 3f8cfb3f662..04f202835df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
@@ -18,4 +18,4 @@ void xxx (void)
    cannot read nor write the memory.  */
 
 /* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim" } } */
-
+/* { dg-final { cleanup-tree-dump "lim" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-1.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-1.c
index 49e05db0df2..6e88eb1ce23 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-1.c
@@ -14,3 +14,4 @@ void g(int *i)
 /* We should have removed the link_error on the tree level as we told GCC
    that *i cannot point to f via the option -fargument-noalias-global. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
index 53929864c00..b295169365e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
@@ -16,4 +16,4 @@ temp:
    optimize this before because PHI-OPT did not look at 
    PHIs which have more than two arguments.  */
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
-
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
index 93a4b66cb5d..415c11777b3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
@@ -19,3 +19,4 @@ _Bool f1(_Bool a, _Bool b)
    value of b (except that we don't fold ! (b != 0) into b
    which can be fixed in a different patch).  */
 /* { dg-final { scan-tree-dump-times "if" 1 "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
index c11b2c64894..54970ad80e0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
@@ -14,4 +14,4 @@ int f(int a, int b)
    optimize this before because PHI-OPT did not look at 
    PHIs which have more than two arguments.  */
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
-
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
index 45563a87276..efd9228b610 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
@@ -14,4 +14,4 @@ _Bool f1()
    value of b (except that we don't fold ! (b != 0) into b
    which means that we miss a sib calling opportunity).  */
 /* { dg-final { scan-tree-dump-times "if " 1 "optimized"} } */
-
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
index 37041d7dabb..7a930dd455e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
@@ -56,3 +56,4 @@ float repl3 (float varz, float vara, float varb)
 
 /* { dg-final { scan-tree-dump "if .*varz" "phiopt1"} } */
 /* { dg-final { scan-tree-dump "vara.*MAX_EXPR" "phiopt1"} } */
+/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
index 62356a156d6..f225f662da4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
@@ -25,3 +25,4 @@ return;
    scan for 3 instances of "fallthru".  */
 
 /* { dg-final { scan-tree-dump-times "fallthru" 3 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
index 8717640e327..9d04ded45da 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
@@ -40,3 +40,4 @@ bar (int a)
    computed goto.  */
 
 /* { dg-final { scan-tree-dump-times "ab" 0 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
index ed2da99d636..d126313feed 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
@@ -23,3 +23,4 @@ return 0;
    computed gotos.  */
 
 /* { dg-final { scan-tree-dump-times "ab" 0 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
index 7a837c837a0..ad293ec6d73 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
@@ -12,3 +12,4 @@ void f1()
 }
 
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "generic" } } */
+/* { dg-final { cleanup-tree-dump "generic" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
index ac89847901a..abb14e604f2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
@@ -15,3 +15,4 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp"} } */
+/* { dg-final { cleanup-tree-dump "vrp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
index c6f1ae6654f..0ed09df9a7b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
@@ -26,3 +26,4 @@ foo (int *p, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp"} } */
+/* { dg-final { cleanup-tree-dump "vrp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20913.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20913.c
index da09183bee3..43abc81c81c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20913.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20913.c
@@ -23,3 +23,4 @@ foo (int a, int b, int c, int d)
 }
 
 /* { dg-final { scan-tree-dump-times "with if \\(1\\)" 2 "copyprop1"} } */
+/* { dg-final { cleanup-tree-dump "copyprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
index c274cd3385e..99a9efe4b6b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
@@ -18,3 +18,4 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp"} } */
+/* { dg-final { cleanup-tree-dump "vrp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
index 39b61c9eb8d..3cba2928f57 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
@@ -10,3 +10,4 @@ f1 (int i, ...)
 {
 }
 /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" } } */
+/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
index e1b2cab5e1e..77a430fd3ce 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
@@ -265,3 +265,4 @@ f15 (int i, ...)
 /* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
 /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target i?86-*-* ia64-*-* } } } */
 /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
+/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
index 1fcf616d7e5..306f7a93ec8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
@@ -168,3 +168,4 @@ f12 (int i, ...)
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units" "stdarg" { target i?86-*-* ia64-*-* } } } */
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
+/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
index 51b50140bdd..840d04a1f49 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
@@ -83,3 +83,4 @@ f4 (int i, ...)
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 8 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target i?86-*-* ia64-*-* } } } */
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
+/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
index e219ca80bc9..ff7b104bceb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
@@ -109,3 +109,4 @@ f7 (int i, ...)
 }
 /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR units and 64 FPR units" "stdarg" { target { x86_64-*-* && lp64 } } } } */
 /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 32 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */
+/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
index 99abc761ab5..bc69c4fe0d7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
@@ -12,4 +12,4 @@ int foo() {
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim" } } */
 /* XXX: We should also check for the load motion of global.x, but there is no easy way to do this.  */
-
+/* { dg-final { cleanup-tree-dump "lim" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
index 327b54c162c..b4d28257e35 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
@@ -43,3 +43,4 @@ int main(void)
 /* { dg-final { scan-tree-dump-times "a.f" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "a.g" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "b.e" 0 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
index 793ee24feb9..a7fcb5bf8ab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
@@ -14,3 +14,4 @@ int main(void)
 	return temp.a + temp.b;
 }
 /* { dg-final { scan-tree-dump-times "return 11" 1 "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */