From a11e92c4e7fd660b0f5ea2095439dc33738c69a5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Jan 2020 17:26:10 +0000 Subject: [PATCH] Fix ICE with cast of division by zero (PR c/93348). Bug 93348 reports an ICE on certain cases of casts of expressions that may appear only in unevaluated parts of integer constant expressions, arising from the generation of nested C_MAYBE_CONST_EXPRs. This patch fixes it by adding a call to remove_c_maybe_const_expr in the integer-operands case, as is done in other similar cases. Bootstrapped with no regressions for x86_64-pc-linux-gnu. PR c/93348 gcc/c: * c-typeck.c (build_c_cast): Call remove_c_maybe_const_expr on argument with integer operands. gcc/testsuite: * gcc.c-torture/compile/pr93348-1.c: New test. (cherry picked from commit ac68e287fc2e939ae6b45ba7ff04e493982b7f62) --- gcc/c/ChangeLog | 9 +++++++++ gcc/c/c-typeck.c | 2 ++ gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.c-torture/compile/pr93348-1.c | 5 +++++ 4 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr93348-1.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 64f0275a58c3..b17ed98a9aed 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,12 @@ +2020-01-22 Joseph Myers + + Backport from mainline: + 2020-01-22 Joseph Myers + + PR c/93348 + * c-typeck.c (build_c_cast): Call remove_c_maybe_const_expr on + argument with integer operands. + 2020-01-15 Joseph Myers Backport from mainline: diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 5d5231dac035..c0582a54c93a 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -5708,6 +5708,8 @@ build_c_cast (location_t loc, tree type, tree expr) expr = TREE_OPERAND (expr, 0); value = expr; + if (int_operands) + value = remove_c_maybe_const_expr (value); if (type == error_mark_node || expr == error_mark_node) return error_mark_node; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 24dda65de76b..d76c05982452 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-01-22 Joseph Myers + + Backport from mainline: + 2020-01-22 Joseph Myers + + PR c/93348 + * gcc.c-torture/compile/pr93348-1.c: New test. + 2020-01-21 Jerry DeLisle Backport from mainline diff --git a/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c b/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c new file mode 100644 index 000000000000..d2edec565eee --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr93348-1.c @@ -0,0 +1,5 @@ +int +ya (void) +{ + return (long int) (1 / 0); +} -- 2.47.2