Hello! 2015-01-31 Uros Bizjak <ubiz...@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. Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN. Uros.
Index: g++.dg/ipa/pr64146.C =================================================================== --- g++.dg/ipa/pr64146.C (revision 220302) +++ g++.dg/ipa/pr64146.C (working copy) @@ -36,3 +36,4 @@ /* { 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" } } */ Index: gcc.target/i386/chkp-builtins-1.c =================================================================== --- gcc.target/i386/chkp-builtins-1.c (revision 220302) +++ gcc.target/i386/chkp-builtins-1.c (working copy) @@ -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) Index: gcc.target/i386/chkp-builtins-2.c =================================================================== --- gcc.target/i386/chkp-builtins-2.c (revision 220302) +++ gcc.target/i386/chkp-builtins-2.c (working copy) @@ -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) Index: gcc.target/i386/chkp-builtins-3.c =================================================================== --- gcc.target/i386/chkp-builtins-3.c (revision 220302) +++ gcc.target/i386/chkp-builtins-3.c (working copy) @@ -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) Index: gcc.target/i386/chkp-builtins-4.c =================================================================== --- gcc.target/i386/chkp-builtins-4.c (revision 220302) +++ gcc.target/i386/chkp-builtins-4.c (working copy) @@ -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) Index: gcc.target/i386/chkp-const-check-1.c =================================================================== --- gcc.target/i386/chkp-const-check-1.c (revision 220302) +++ gcc.target/i386/chkp-const-check-1.c (working copy) @@ -3,8 +3,8 @@ /* { 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) { p = (int *)__builtin___bnd_set_ptr_bounds (p, sizeof (int)); Index: gcc.target/i386/chkp-lifetime-1.c =================================================================== --- gcc.target/i386/chkp-lifetime-1.c (revision 220302) +++ gcc.target/i386/chkp-lifetime-1.c (working copy) @@ -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[]; Index: gcc.target/i386/chkp-remove-bndint-1.c =================================================================== --- gcc.target/i386/chkp-remove-bndint-1.c (revision 220302) +++ gcc.target/i386/chkp-remove-bndint-1.c (working copy) @@ -2,8 +2,8 @@ /* { 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 { int a; Index: gcc.target/i386/chkp-remove-bndint-2.c =================================================================== --- gcc.target/i386/chkp-remove-bndint-2.c (revision 220302) +++ gcc.target/i386/chkp-remove-bndint-2.c (working copy) @@ -2,8 +2,8 @@ /* { 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 { int a; Index: gfortran.dg/goacc/private-1.f95 =================================================================== --- gfortran.dg/goacc/private-1.f95 (revision 220302) +++ gfortran.dg/goacc/private-1.f95 (working copy) @@ -35,3 +35,4 @@ ! { 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" } }