This fixes scans for "fab" with "fab1" which now appears twice after adding -Og.
Tested on x86_64-unknown-linux-gnu, applied. Sorry for the breakage, Richard. 2012-09-19 Richard Guenther <rguent...@suse.de> * gcc.dg/builtin-object-size-10.c: Adjust. * gcc.dg/builtin-unreachable-5.c: Adjust. * gcc.dg/tree-ssa/builtin-fprintf-1.c: Adjust. * gcc.dg/tree-ssa/builtin-fprintf-chk-1.c: Adjust. * gcc.dg/tree-ssa/builtin-printf-1.c: Adjust. * gcc.dg/tree-ssa/builtin-printf-chk-1.c: Adjust. * gcc.dg/tree-ssa/builtin-vfprintf-1.c: Adjust. * gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c: Adjust. * gcc.dg/tree-ssa/builtin-vprintf-1.c: Adjust. * gcc.dg/tree-ssa/builtin-vprintf-chk-1.c: Adjust. * gcc.dg/tree-ssa/ssa-ccp-10.c: Adjust. * gcc.dg/vect/vec-scal-opt.c: Adjust. * gcc.dg/vect/vec-scal-opt1.c: Adjust. * gcc.dg/vect/vec-scal-opt2.c: Adjust. Index: gcc/testsuite/gcc.dg/builtin-object-size-10.c =================================================================== --- gcc/testsuite/gcc.dg/builtin-object-size-10.c (revision 191466) +++ gcc/testsuite/gcc.dg/builtin-object-size-10.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-objsz-details" } */ +/* { dg-options "-O2 -fdump-tree-objsz1-details" } */ typedef struct { char sentinel[4]; @@ -21,6 +21,6 @@ foo(char *x) return dpkt; } -/* { dg-final { scan-tree-dump "maximum object size 21" "objsz" } } */ -/* { dg-final { scan-tree-dump "maximum subobject size 16" "objsz" } } */ -/* { dg-final { cleanup-tree-dump "objsz" } } */ +/* { dg-final { scan-tree-dump "maximum object size 21" "objsz1" } } */ +/* { dg-final { scan-tree-dump "maximum subobject size 16" "objsz1" } } */ +/* { dg-final { cleanup-tree-dump "objsz1" } } */ Index: gcc/testsuite/gcc.dg/builtin-unreachable-5.c =================================================================== --- gcc/testsuite/gcc.dg/builtin-unreachable-5.c (revision 191466) +++ gcc/testsuite/gcc.dg/builtin-unreachable-5.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ int foo (int a) @@ -16,8 +16,8 @@ foo (int a) return a > 0; } -/* { dg-final { scan-tree-dump-times "if \\(" 0 "fab" } } */ -/* { dg-final { scan-tree-dump-times "goto" 0 "fab" } } */ -/* { dg-final { scan-tree-dump-times "L1:" 0 "fab" } } */ -/* { dg-final { scan-tree-dump-times "__builtin_unreachable" 0 "fab" } } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump-times "if \\(" 0 "fab1" } } */ +/* { dg-final { scan-tree-dump-times "goto" 0 "fab1" } } */ +/* { dg-final { scan-tree-dump-times "L1:" 0 "fab1" } } */ +/* { dg-final { scan-tree-dump-times "__builtin_unreachable" 0 "fab1" } } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ typedef struct { int i; } FILE; FILE *fp; @@ -29,13 +29,13 @@ void test (void) vi9 = 0; } -/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*fwrite.*\"hello\".*1, 5, fp.*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab"} } */ -/* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab"} } */ -/* { dg-final { scan-tree-dump "vi8.*fprintf.*fp.*\"%d%d\".*vi9" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*fwrite.*\"hello\".*1, 5, fp.*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi8.*fprintf.*fp.*\"%d%d\".*vi9" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ typedef struct { int i; } FILE; FILE *fp; @@ -29,13 +29,13 @@ void test (void) vi9 = 0; } -/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*fwrite.*\"hello\".*1, 5, fp.*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab"} } */ -/* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab"} } */ -/* { dg-final { scan-tree-dump "vi8.*__fprintf_chk.*fp.*1.*\"%d%d\".*vi9" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*fwrite.*\"hello\".*1, 5, fp.*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi8.*__fprintf_chk.*fp.*1.*\"%d%d\".*vi9" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ extern int printf (const char *, ...); volatile int vi0, vi1, vi2, vi3, vi4, vi5, vi6, vi7, vi8, vi9, via; @@ -29,14 +29,14 @@ void test (void) via = 0; } -/* { dg-final { scan-tree-dump "vi0.*printf.*\"hello\".*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*printf.*\"hello\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*puts.*\"hello\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*putchar.*vi7" "fab"} } */ -/* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab"} } */ -/* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*printf.*\"hello\".*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*printf.*\"hello\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*puts.*\"hello\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*putchar.*vi7" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ extern int __printf_chk (int, const char *, ...); volatile int vi0, vi1, vi2, vi3, vi4, vi5, vi6, vi7, vi8, vi9, via; @@ -29,14 +29,14 @@ void test (void) via = 0; } -/* { dg-final { scan-tree-dump "vi0.*__printf_chk.*1.*\"hello\".*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*__printf_chk.*1.*\"hello\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*puts.*\"hello\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*putchar.*vi7" "fab"} } */ -/* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab"} } */ -/* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*__printf_chk.*1.*\"hello\".*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*__printf_chk.*1.*\"hello\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*puts.*\"hello\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*putchar.*vi7" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ #include <stdarg.h> @@ -29,11 +29,11 @@ test (va_list ap1, va_list ap2, va_list vi7 = 0; } -/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*vfprintf.*\"%s\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*vfprintf.*\"%c\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*vfprintf.*\"%s\\\\n\".*vi7" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*vfprintf.*\"%s\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*vfprintf.*\"%c\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*vfprintf.*\"%s\\\\n\".*vi7" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ #include <stdarg.h> @@ -29,11 +29,11 @@ test (va_list ap1, va_list ap2, va_list vi7 = 0; } -/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*__vfprintf_chk.*fp.*1.*\"%s\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*__vfprintf_chk.*fp.*1.*\"%c\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*__vfprintf_chk.*fp.*1.*\"%s\\\\n\".*vi7" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*fwrite.*\"hello\".*1, 5, fp.*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*fwrite.*\"hello\\\\n\".*1, 6, fp.*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*fputc.*fp.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*__vfprintf_chk.*fp.*1.*\"%s\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*__vfprintf_chk.*fp.*1.*\"%c\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*__vfprintf_chk.*fp.*1.*\"%s\\\\n\".*vi7" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ #include <stdarg.h> @@ -27,11 +27,11 @@ test (va_list ap1, va_list ap2, va_list vi7 = 0; } -/* { dg-final { scan-tree-dump "vi0.*vprintf.*\"hello\".*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*vprintf.*\"%s\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*vprintf.*\"%c\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*vprintf.*\"%s\\\\n\".*vi7" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*vprintf.*\"hello\".*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*vprintf.*\"%s\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*vprintf.*\"%c\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*vprintf.*\"%s\\\\n\".*vi7" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-fab" } */ +/* { dg-options "-O2 -fdump-tree-fab1" } */ #include <stdarg.h> @@ -27,11 +27,11 @@ test (va_list ap1, va_list ap2, va_list vi7 = 0; } -/* { dg-final { scan-tree-dump "vi0.*__vprintf_chk.*1.*\"hello\".*vi1" "fab"} } */ -/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab"} } */ -/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab"} } */ -/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab"} } */ -/* { dg-final { scan-tree-dump "vi4.*__vprintf_chk.*1.*\"%s\".*vi5" "fab"} } */ -/* { dg-final { scan-tree-dump "vi5.*__vprintf_chk.*1.*\"%c\".*vi6" "fab"} } */ -/* { dg-final { scan-tree-dump "vi6.*__vprintf_chk.*1.*\"%s\\\\n\".*vi7" "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump "vi0.*__vprintf_chk.*1.*\"hello\".*vi1" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi1.*puts.*\"hello\".*vi2" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi2.*putchar.*vi3" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi3 ={v} 0\[^\(\)\]*vi4 ={v} 0" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi4.*__vprintf_chk.*1.*\"%s\".*vi5" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi5.*__vprintf_chk.*1.*\"%c\".*vi6" "fab1"} } */ +/* { dg-final { scan-tree-dump "vi6.*__vprintf_chk.*1.*\"%s\\\\n\".*vi7" "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c (revision 191466) +++ gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-fab" } */ +/* { dg-options "-O1 -fdump-tree-fab1" } */ /* Check that we fold strlen of equally long strings, and that we do not fail to terminate when there is a nontrivial cycle in the corresponding @@ -30,5 +30,5 @@ middle: } /* There should be no calls to strlen. */ -/* { dg-final { scan-tree-dump-times "strlen" 0 "fab"} } */ -/* { dg-final { cleanup-tree-dump "fab" } } */ +/* { dg-final { scan-tree-dump-times "strlen" 0 "fab1"} } */ +/* { dg-final { cleanup-tree-dump "fab1" } } */ Index: gcc/testsuite/gcc.dg/vect/vec-scal-opt.c =================================================================== --- gcc/testsuite/gcc.dg/vect/vec-scal-opt.c (revision 191466) +++ gcc/testsuite/gcc.dg/vect/vec-scal-opt.c (working copy) @@ -19,5 +19,5 @@ int main (int argc, char *argv[]) { return vidx(short, r1, 0); } -/* { dg-final { scan-tree-dump-times ">> k.\[0-9_\]*" 1 "veclower2" } } */ -/* { dg-final { cleanup-tree-dump "veclower2" } } */ +/* { dg-final { scan-tree-dump-times ">> k.\[0-9_\]*" 1 "veclower21" } } */ +/* { dg-final { cleanup-tree-dump "veclower21" } } */ Index: gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c =================================================================== --- gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c (revision 191466) +++ gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c (working copy) @@ -17,5 +17,5 @@ int main (int argc, char *argv[]) { return vidx(short, r1, 0); } -/* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower2" } } */ -/* { dg-final { cleanup-tree-dump "veclower2" } } */ +/* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower21" } } */ +/* { dg-final { cleanup-tree-dump "veclower21" } } */ Index: gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c =================================================================== --- gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c (revision 191466) +++ gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c (working copy) @@ -16,5 +16,5 @@ int main (int argc, char *argv[]) { return vidx(short, r1, 0); } -/* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower2" } } */ -/* { dg-final { cleanup-tree-dump "veclower2" } } */ +/* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower21" } } */ +/* { dg-final { cleanup-tree-dump "veclower21" } } */