aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/cp/ChangeLog10
-rw-r--r--gcc/cp/typeck.c43
-rw-r--r--gcc/cp/typeck2.c10
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/init/pr88375-2.C41
-rw-r--r--gcc/testsuite/g++.dg/init/pr88375.C26
6 files changed, 114 insertions, 22 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index beae265..7b79461 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,15 @@
2018-12-19 David Malcolm <dmalcolm@redhat.com>
+ PR c++/88375
+ * typeck.c (convert_for_assignment): Capture location of rhs
+ before stripping, and if available. Use the location when
+ complaining about bad conversions, labelling it with the
+ rhstype if the location was present.
+ * typeck2.c (digest_init_r): Capture location of init before
+ stripping.
+
+2018-12-19 David Malcolm <dmalcolm@redhat.com>
+
PR c++/87504
* call.c (op_error): Convert 1st param from location_t to
const op_location_t &. Use binary_op_rich_location for binary
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 94a33d4..ef317f5 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -8852,6 +8852,7 @@ convert_for_assignment (tree type, tree rhs,
enum tree_code coder;
location_t rhs_loc = EXPR_LOC_OR_LOC (rhs, input_location);
+ bool has_loc = EXPR_LOCATION (rhs) != UNKNOWN_LOCATION;
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue,
but preserve location wrappers. */
if (TREE_CODE (rhs) == NON_LVALUE_EXPR
@@ -8892,7 +8893,7 @@ convert_for_assignment (tree type, tree rhs,
if (coder == VOID_TYPE)
{
if (complain & tf_error)
- error ("void value not ignored as it ought to be");
+ error_at (rhs_loc, "void value not ignored as it ought to be");
return error_mark_node;
}
@@ -8964,35 +8965,43 @@ convert_for_assignment (tree type, tree rhs,
rhstype, type,
fndecl, parmnum);
else
- switch (errtype)
- {
+ {
+ range_label_for_type_mismatch label (rhstype, type);
+ gcc_rich_location richloc (rhs_loc, has_loc ? &label : NULL);
+ switch (errtype)
+ {
case ICR_DEFAULT_ARGUMENT:
- error ("cannot convert %qH to %qI in default argument",
- rhstype, type);
+ error_at (&richloc,
+ "cannot convert %qH to %qI in default argument",
+ rhstype, type);
break;
case ICR_ARGPASS:
- error ("cannot convert %qH to %qI in argument passing",
- rhstype, type);
+ error_at (&richloc,
+ "cannot convert %qH to %qI in argument passing",
+ rhstype, type);
break;
case ICR_CONVERTING:
- error ("cannot convert %qH to %qI",
- rhstype, type);
+ error_at (&richloc, "cannot convert %qH to %qI",
+ rhstype, type);
break;
case ICR_INIT:
- error ("cannot convert %qH to %qI in initialization",
- rhstype, type);
+ error_at (&richloc,
+ "cannot convert %qH to %qI in initialization",
+ rhstype, type);
break;
case ICR_RETURN:
- error ("cannot convert %qH to %qI in return",
- rhstype, type);
+ error_at (&richloc, "cannot convert %qH to %qI in return",
+ rhstype, type);
break;
case ICR_ASSIGN:
- error ("cannot convert %qH to %qI in assignment",
- rhstype, type);
+ error_at (&richloc,
+ "cannot convert %qH to %qI in assignment",
+ rhstype, type);
break;
default:
gcc_unreachable();
}
+ }
if (TYPE_PTR_P (rhstype)
&& TYPE_PTR_P (type)
&& CLASS_TYPE_P (TREE_TYPE (rhstype))
@@ -9059,9 +9068,7 @@ convert_for_assignment (tree type, tree rhs,
&& TREE_CODE (TREE_TYPE (rhs)) != BOOLEAN_TYPE
&& (complain & tf_warning))
{
- location_t loc = cp_expr_loc_or_loc (rhs, input_location);
-
- warning_at (loc, OPT_Wparentheses,
+ warning_at (rhs_loc, OPT_Wparentheses,
"suggest parentheses around assignment used as truth value");
TREE_NO_WARNING (rhs) = 1;
}
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index c1fa4a9..209832b 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1050,14 +1050,16 @@ digest_init_r (tree type, tree init, int nested, int flags,
complain))
return error_mark_node;
+ location_t loc = cp_expr_loc_or_loc (init, input_location);
+
+ tree stripped_init = init;
+
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue
(g++.old-deja/g++.law/casts2.C). */
if (TREE_CODE (init) == NON_LVALUE_EXPR)
- init = TREE_OPERAND (init, 0);
-
- location_t loc = cp_expr_loc_or_loc (init, input_location);
+ stripped_init = TREE_OPERAND (init, 0);
- tree stripped_init = tree_strip_any_location_wrapper (init);
+ stripped_init = tree_strip_any_location_wrapper (stripped_init);
/* Initialization of an array of chars from a string constant. The initializer
can be optionally enclosed in braces, but reshape_init has already removed
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4a61338..b996242 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2018-12-19 David Malcolm <dmalcolm@redhat.com>
+ PR c++/88375
+ * g++.dg/init/pr88375-2.C: New test.
+ * g++.dg/init/pr88375.C: New test.
+
+2018-12-19 David Malcolm <dmalcolm@redhat.com>
+
* c-c++-common/Wtautological-compare-ranges.c: New test.
* g++.dg/cpp0x/pr51420.C: Add -fdiagnostics-show-caret and update
expected output.
diff --git a/gcc/testsuite/g++.dg/init/pr88375-2.C b/gcc/testsuite/g++.dg/init/pr88375-2.C
new file mode 100644
index 0000000..97ed72e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/pr88375-2.C
@@ -0,0 +1,41 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-fdiagnostics-show-caret" }
+
+enum struct a : int {
+ one, two
+};
+
+constexpr int fn () { return 42; }
+
+struct foo {
+ int e1, e2;
+ a e3;
+} arr[] = {
+ { 3, a::two }, // { dg-error "11: cannot convert 'a' to 'int' in initialization" }
+ /* { dg-begin-multiline-output "" }
+ { 3, a::two },
+ ~~~^~~
+ |
+ a
+ { dg-end-multiline-output "" } */
+ { 6, 7, fn() }, // { dg-error "13: cannot convert 'int' to 'a' in initialization" }
+ /* { dg-begin-multiline-output "" }
+ { 6, 7, fn() },
+ ~~^~
+ |
+ int
+ { dg-end-multiline-output "" } */
+};
+
+struct bar {
+ const char *f1;
+ int f2;
+} arr_2[] = {
+ { 42 }, // { dg-error "5: invalid conversion from 'int' to 'const char\\*'" }
+ /* { dg-begin-multiline-output "" }
+ { 42 },
+ ^~
+ |
+ int
+ { dg-end-multiline-output "" } */
+};
diff --git a/gcc/testsuite/g++.dg/init/pr88375.C b/gcc/testsuite/g++.dg/init/pr88375.C
new file mode 100644
index 0000000..21dd6c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/pr88375.C
@@ -0,0 +1,26 @@
+// { dg-do compile { target c++11 } }
+
+enum struct a : int {
+ one, two
+};
+
+constexpr int fn () { return 42; }
+
+struct foo {
+ int e1, e2;
+ a e3;
+} arr[] = {
+ { 1, 2, a::one },
+ { 3, a::two }, // { dg-error "11: cannot convert 'a' to 'int' in initialization" }
+ { 6, 7, 8 }, // { dg-error "11: cannot convert 'int' to 'a' in initialization" }
+ { 6, 7, fn() }, // { dg-error "13: cannot convert 'int' to 'a' in initialization" }
+};
+
+struct bar {
+ const char *f1;
+ int f2;
+} arr_2[] = {
+ { "hello world", 42 },
+ { 42 }, // { dg-error "5: invalid conversion from 'int' to 'const char\\*'" }
+ { "hello", "world" }, // { dg-error "14: invalid conversion from 'const char\\*' to 'int'" }
+};
generated by cgit v1.1 at 2025-06-02 16:07:51 +0000