diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2019-08-24 19:39:44 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2019-08-24 19:39:44 +0000 |
| commit | c6ca0e3e69e2e3681c81d5a5ddd2dcd6f41b7522 (patch) | |
| tree | 3bfac7cc3fa58bbf1e2ea170bd0d9c63efd7bc8e /gcc | |
| parent | 22b23ef2379b1abdb80fd293ac1bc0ff1ab6c170 (diff) | |
| download | gcc-c6ca0e3e69e2e3681c81d5a5ddd2dcd6f41b7522.zip gcc-c6ca0e3e69e2e3681c81d5a5ddd2dcd6f41b7522.tar.gz gcc-c6ca0e3e69e2e3681c81d5a5ddd2dcd6f41b7522.tar.bz2 | |
semantics.c (finish_switch_cond): Improve error message location.
/cp
2019-08-24 Paolo Carlini <paolo.carlini@oracle.com>
* semantics.c (finish_switch_cond): Improve error message location.
/testsuite
2019-08-24 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/conversion/simd4.C: Test all the locations.
From-SVN: r274901
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/simd4.C | 16 |
4 files changed, 19 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 86d1849..d0a8c77 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2019-08-24 Paolo Carlini <paolo.carlini@oracle.com> + + * semantics.c (finish_switch_cond): Improve error message location. + 2019-08-22 Jason Merrill <jason@redhat.com> * decl2.c (decl_dependent_p): New. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 8aec4ef..1f774593 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1185,10 +1185,12 @@ finish_switch_cond (tree cond, tree switch_stmt) if (!processing_template_decl) { /* Convert the condition to an integer or enumeration type. */ + tree orig_cond = cond; cond = build_expr_type_conversion (WANT_INT | WANT_ENUM, cond, true); if (cond == NULL_TREE) { - error ("switch quantity not an integer"); + error_at (cp_expr_loc_or_input_loc (orig_cond), + "switch quantity not an integer"); cond = error_mark_node; } /* We want unlowered type here to handle enum bit-fields. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2162fcf..af6fe82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-08-24 Paolo Carlini <paolo.carlini@oracle.com> + + * g++.dg/conversion/simd4.C: Test all the locations. + 2019-08-23 Marek Polacek <polacek@redhat.com> PR c++/91521 - wrong error with operator->. diff --git a/gcc/testsuite/g++.dg/conversion/simd4.C b/gcc/testsuite/g++.dg/conversion/simd4.C index 22274a1..9d43b02 100644 --- a/gcc/testsuite/g++.dg/conversion/simd4.C +++ b/gcc/testsuite/g++.dg/conversion/simd4.C @@ -20,15 +20,15 @@ foo () v[b]; // { dg-error "4:invalid types" } w[b]; // { dg-error "4:invalid types" } new int[t]; - new int[u]; // { dg-error "new-declarator must have integral" } - new int[v]; // { dg-error "new-declarator must have integral" } - new int[w]; // { dg-error "new-declarator must have integral" } + new int[u]; // { dg-error "11:expression in new-declarator must have integral" } + new int[v]; // { dg-error "11:expression in new-declarator must have integral" } + new int[w]; // { dg-error "11:expression in new-declarator must have integral" } switch (t) { default: break; } - switch (u) { default: break; } // { dg-error "switch quantity not an integer" } - switch (v) { default: break; } // { dg-error "switch quantity not an integer" } - switch (w) { default: break; } // { dg-error "switch quantity not an integer" } + switch (u) { default: break; } // { dg-error "11:switch quantity not an integer" } + switch (v) { default: break; } // { dg-error "11:switch quantity not an integer" } + switch (w) { default: break; } // { dg-error "11:switch quantity not an integer" } t = ~t; - u = ~u; // { dg-error "wrong type argument to bit-complement" } + u = ~u; // { dg-error "8:wrong type argument to bit-complement" } v = ~v; - w = ~w; // { dg-error "wrong type argument to bit-complement" } + w = ~w; // { dg-error "8:wrong type argument to bit-complement" } } |