* [PATCH] c++: Fix excess precision related ICE on invalid binop [PR107382, PR107383]
@ 2022-10-26 8:23 Jakub Jelinek
2022-10-26 16:56 ` Jason Merrill
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2022-10-26 8:23 UTC (permalink / raw)
To: Jason Merrill; +Cc: gcc-patches
Hi!
The following tests ICE in the gcc_assert (common); in cp_build_binary_op.
I've missed that while for * common is set always, while for +, - and /
it is in some cases not.
If it is not, then
if (!result_type
&& arithmetic_types_p
&& (shorten || common || short_compare))
condition is false, then the following
if (may_need_excess_precision
&& (orig_type0 != type0 || orig_type1 != type1)
&& build_type == NULL_TREE)
would fail the assertion there and if there wouldn't be excess precision,
if (code == SPACESHIP_EXPR)
would be false (for SPACESHIP_EXPR we always have build_type set like for
other comparisons) and then trigger
if (!result_type)
{
if (complain & tf_error)
{
binary_op_rich_location richloc (location,
orig_op0, orig_op1, true);
error_at (&richloc,
"invalid operands of types %qT and %qT to binary %qO",
TREE_TYPE (orig_op0), TREE_TYPE (orig_op1), code);
}
return error_mark_node;
}
So, if result_type is NULL, we don't really need to compute
semantic_result_type because nothing will use it anyway and can get
fall through into the error/return error_mark_node; case.
Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
2022-10-26 Jakub Jelinek <jakub@redhat.com>
PR c++/107382
PR c++/107383
* typeck.cc (cp_build_binary_op): Don't compute semantic_result_type
if result_type is NULL.
* g++.dg/diagnostic/bad-binary-ops2.C: New test.
--- gcc/cp/typeck.cc.jj 2022-10-25 10:37:28.008533040 +0200
+++ gcc/cp/typeck.cc 2022-10-25 19:18:20.951846806 +0200
@@ -6179,7 +6179,8 @@ cp_build_binary_op (const op_location_t
}
if (may_need_excess_precision
&& (orig_type0 != type0 || orig_type1 != type1)
- && build_type == NULL_TREE)
+ && build_type == NULL_TREE
+ && result_type)
{
gcc_assert (common);
semantic_result_type = cp_common_type (orig_type0, orig_type1);
--- gcc/testsuite/g++.dg/diagnostic/bad-binary-ops2.C.jj 2022-10-25 19:49:49.190198057 +0200
+++ gcc/testsuite/g++.dg/diagnostic/bad-binary-ops2.C 2022-10-25 20:10:35.266264891 +0200
@@ -0,0 +1,26 @@
+// PR c++/107382
+// PR c++/107383
+// { dg-do compile }
+// { dg-options "-O2 -fexcess-precision=standard" }
+
+void
+foo ()
+{
+ float t[2] = { 1, 2 };
+ int const *s = 0;
+ t[1] / s; // { dg-error "invalid operands of types 'float' and 'const int\\\*' to binary 'operator/'" }
+}
+
+void
+bar ()
+{
+ float t[2] = { 1, 2 };
+ int const *s[2] = { 0, 0 };
+ t[1] / s[0]; // { dg-error "invalid operands of types 'float' and 'const int\\\*' to binary 'operator/'" }
+}
+
+void
+baz (float a, int* b)
+{
+ a -= b; // { dg-error "invalid operands of types 'float' and 'int\\\*' to binary 'operator-'" }
+}
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] c++: Fix excess precision related ICE on invalid binop [PR107382, PR107383]
2022-10-26 8:23 [PATCH] c++: Fix excess precision related ICE on invalid binop [PR107382, PR107383] Jakub Jelinek
@ 2022-10-26 16:56 ` Jason Merrill
0 siblings, 0 replies; 2+ messages in thread
From: Jason Merrill @ 2022-10-26 16:56 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: gcc-patches
On 10/26/22 04:23, Jakub Jelinek wrote:
> Hi!
>
> The following tests ICE in the gcc_assert (common); in cp_build_binary_op.
> I've missed that while for * common is set always, while for +, - and /
> it is in some cases not.
> If it is not, then
> if (!result_type
> && arithmetic_types_p
> && (shorten || common || short_compare))
> condition is false, then the following
> if (may_need_excess_precision
> && (orig_type0 != type0 || orig_type1 != type1)
> && build_type == NULL_TREE)
> would fail the assertion there and if there wouldn't be excess precision,
> if (code == SPACESHIP_EXPR)
> would be false (for SPACESHIP_EXPR we always have build_type set like for
> other comparisons) and then trigger
> if (!result_type)
> {
> if (complain & tf_error)
> {
> binary_op_rich_location richloc (location,
> orig_op0, orig_op1, true);
> error_at (&richloc,
> "invalid operands of types %qT and %qT to binary %qO",
> TREE_TYPE (orig_op0), TREE_TYPE (orig_op1), code);
> }
> return error_mark_node;
> }
> So, if result_type is NULL, we don't really need to compute
> semantic_result_type because nothing will use it anyway and can get
> fall through into the error/return error_mark_node; case.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
OK.
> 2022-10-26 Jakub Jelinek <jakub@redhat.com>
>
> PR c++/107382
> PR c++/107383
> * typeck.cc (cp_build_binary_op): Don't compute semantic_result_type
> if result_type is NULL.
>
> * g++.dg/diagnostic/bad-binary-ops2.C: New test.
>
> --- gcc/cp/typeck.cc.jj 2022-10-25 10:37:28.008533040 +0200
> +++ gcc/cp/typeck.cc 2022-10-25 19:18:20.951846806 +0200
> @@ -6179,7 +6179,8 @@ cp_build_binary_op (const op_location_t
> }
> if (may_need_excess_precision
> && (orig_type0 != type0 || orig_type1 != type1)
> - && build_type == NULL_TREE)
> + && build_type == NULL_TREE
> + && result_type)
> {
> gcc_assert (common);
> semantic_result_type = cp_common_type (orig_type0, orig_type1);
> --- gcc/testsuite/g++.dg/diagnostic/bad-binary-ops2.C.jj 2022-10-25 19:49:49.190198057 +0200
> +++ gcc/testsuite/g++.dg/diagnostic/bad-binary-ops2.C 2022-10-25 20:10:35.266264891 +0200
> @@ -0,0 +1,26 @@
> +// PR c++/107382
> +// PR c++/107383
> +// { dg-do compile }
> +// { dg-options "-O2 -fexcess-precision=standard" }
> +
> +void
> +foo ()
> +{
> + float t[2] = { 1, 2 };
> + int const *s = 0;
> + t[1] / s; // { dg-error "invalid operands of types 'float' and 'const int\\\*' to binary 'operator/'" }
> +}
> +
> +void
> +bar ()
> +{
> + float t[2] = { 1, 2 };
> + int const *s[2] = { 0, 0 };
> + t[1] / s[0]; // { dg-error "invalid operands of types 'float' and 'const int\\\*' to binary 'operator/'" }
> +}
> +
> +void
> +baz (float a, int* b)
> +{
> + a -= b; // { dg-error "invalid operands of types 'float' and 'int\\\*' to binary 'operator-'" }
> +}
>
> Jakub
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-26 16:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 8:23 [PATCH] c++: Fix excess precision related ICE on invalid binop [PR107382, PR107383] Jakub Jelinek
2022-10-26 16:56 ` Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).