From f0d7b52d4f84999ebef4888bced90a737fba7dfe Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 24 Mar 2017 12:57:14 +0000 Subject: [PATCH] Adjust c-c++-common/Wimplicit-fallthrough-7.c etc. line numbers * c-c++-common/Wimplicit-fallthrough-7.c: Adjust dg-warning etc. line numbers. * gcc.dg/Walloca-1.c: Likewise. * gcc.dg/Walloca-2.c: Likewise. * gcc.dg/Wvla-larger-than-2.c: Likewise. From-SVN: r246440 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/c-c++-common/Wimplicit-fallthrough-7.c | 8 ++++---- gcc/testsuite/gcc.dg/Walloca-1.c | 2 +- gcc/testsuite/gcc.dg/Walloca-2.c | 4 ++-- gcc/testsuite/gcc.dg/Wvla-larger-than-2.c | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 759d2b3fd3c..5ab5619e8e1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2017-03-24 Rainer Orth + + * c-c++-common/Wimplicit-fallthrough-7.c: Adjust dg-warning + etc. line numbers. + * gcc.dg/Walloca-1.c: Likewise. + * gcc.dg/Walloca-2.c: Likewise. + * gcc.dg/Wvla-larger-than-2.c: Likewise. + 2017-03-24 Bill Schmidt PR tree-optimization/80158 diff --git a/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-7.c b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-7.c index 1adf53b3850..e03b09b3e5d 100644 --- a/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-7.c +++ b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-7.c @@ -21,8 +21,8 @@ f (int i) switch (i) { case 1: - { /* { dg-warning "statement may fall through" "" { target c } 23 } */ - int a[i]; /* { dg-warning "statement may fall through" "" { target c++ } 24 } */ + { /* { dg-warning "statement may fall through" "" { target c } 24 } */ + int a[i]; /* { dg-warning "statement may fall through" "" { target c++ } 25 } */ } case 2: bar (99); @@ -31,8 +31,8 @@ f (int i) switch (i) { case 1: - for (int j = 0; j < 10; j++) /* { dg-warning "statement may fall through" "" { target c } 33 } */ - map[j] = j; /* { dg-warning "statement may fall through" "" { target c++ } 34 } */ + for (int j = 0; j < 10; j++) /* { dg-warning "statement may fall through" "" { target c } 34 } */ + map[j] = j; /* { dg-warning "statement may fall through" "" { target c++ } 35 } */ case 2: bar (99); } diff --git a/gcc/testsuite/gcc.dg/Walloca-1.c b/gcc/testsuite/gcc.dg/Walloca-1.c index d98a142e9b0..fa191246054 100644 --- a/gcc/testsuite/gcc.dg/Walloca-1.c +++ b/gcc/testsuite/gcc.dg/Walloca-1.c @@ -25,7 +25,7 @@ void foo1 (size_t len, size_t len2, size_t len3) useit (s); // OK, constant argument to alloca s = alloca (num); // { dg-warning "large due to conversion" "" { target lp64 } } - // { dg-warning "unbounded use of 'alloca'" "" { target { ! lp64 } } 26 } + // { dg-warning "unbounded use of 'alloca'" "" { target { ! lp64 } } 27 } useit (s); s = alloca (30000); /* { dg-warning "is too large" } */ diff --git a/gcc/testsuite/gcc.dg/Walloca-2.c b/gcc/testsuite/gcc.dg/Walloca-2.c index 5ba9711d299..81d923c1e50 100644 --- a/gcc/testsuite/gcc.dg/Walloca-2.c +++ b/gcc/testsuite/gcc.dg/Walloca-2.c @@ -37,8 +37,8 @@ g3 (int n) if (n > 0 && n < 3000) { p = __builtin_alloca (n); // { dg-warning "'alloca' may be too large" "" { target lp64} } - // { dg-message "note:.*argument may be as large as 2999" "note" { target lp64 } 38 } - // { dg-warning "unbounded use of 'alloca'" "" { target { ! lp64 } } 38 } + // { dg-message "note:.*argument may be as large as 2999" "note" { target lp64 } 39 } + // { dg-warning "unbounded use of 'alloca'" "" { target { ! lp64 } } 39 } } else p = __builtin_malloc (n); diff --git a/gcc/testsuite/gcc.dg/Wvla-larger-than-2.c b/gcc/testsuite/gcc.dg/Wvla-larger-than-2.c index 42ec5bbf4f8..68de771cbbd 100644 --- a/gcc/testsuite/gcc.dg/Wvla-larger-than-2.c +++ b/gcc/testsuite/gcc.dg/Wvla-larger-than-2.c @@ -24,7 +24,7 @@ f2 (__SIZE_TYPE__ a) { // 11 * 4 bytes = 44: Not OK. uint32_t x[a]; // { dg-warning "array may be too large" } - // { dg-message "note:.*argument may be as large as 44" "note" { target *-*-* } 25 } + // { dg-message "note:.*argument may be as large as 44" "note" { target *-*-* } 26 } f0 (x); } } -- 2.30.2