From ea37206decb6b4df127e65af206c58e6fc3ae60a Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 7 Dec 2019 12:20:44 +0000 Subject: [PATCH] re PR middle-end/90840 (ICE in simplify_subreg, at simplify-rtx.c:6441) PR middle-end/90840 * expr.c (expand_assignment): In the case of a CONCAT on the LHS, make sure to pass a valid inner mode in calls to simplify_gen_subreg. From-SVN: r279076 --- gcc/ChangeLog | 6 ++++++ gcc/expr.c | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0eda8e01d20..582ffe09923 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-12-07 Eric Botcazou + + PR middle-end/90840 + * expr.c (expand_assignment): In the case of a CONCAT on the LHS, make + sure to pass a valid inner mode in calls to simplify_gen_subreg. + 2019-12-07 Tobias Burnus David Malcolm Jakub Jelinek diff --git a/gcc/expr.c b/gcc/expr.c index ed50586971f..20aa939709c 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -5285,13 +5285,16 @@ expand_assignment (tree to, tree from, bool nontemporal) } else { + machine_mode from_mode + = GET_MODE (result) == VOIDmode + ? TYPE_MODE (TREE_TYPE (from)) + : GET_MODE (result); rtx from_rtx; if (MEM_P (result)) from_rtx = change_address (result, to_mode, NULL_RTX); else from_rtx - = simplify_gen_subreg (to_mode, result, - TYPE_MODE (TREE_TYPE (from)), 0); + = simplify_gen_subreg (to_mode, result, from_mode, 0); if (from_rtx) { emit_move_insn (XEXP (to_rtx, 0), @@ -5303,12 +5306,9 @@ expand_assignment (tree to, tree from, bool nontemporal) { to_mode = GET_MODE_INNER (to_mode); rtx from_real - = simplify_gen_subreg (to_mode, result, - TYPE_MODE (TREE_TYPE (from)), - 0); + = simplify_gen_subreg (to_mode, result, from_mode, 0); rtx from_imag - = simplify_gen_subreg (to_mode, result, - TYPE_MODE (TREE_TYPE (from)), + = simplify_gen_subreg (to_mode, result, from_mode, GET_MODE_SIZE (to_mode)); if (!from_real || !from_imag) goto concat_store_slow; -- 2.30.2