expr.c (expand_assignment): Force an address offset computation into a register before changing its mode.

* expr.c (expand_assignment): Force an address offset computation
	into a register before changing its mode.
	(expand_expr_real_1): Likewise.

From-SVN: r222098
This commit is contained in:
Nick Clifton 2015-04-14 16:12:34 +00:00 committed by Nick Clifton
parent fb899e32c1
commit 5751fb330d
2 changed files with 20 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2015-04-14 Nick Clifton <nickc@redhat.com>
* expr.c (expand_assignment): Force an address offset computation
into a register before changing its mode.
(expand_expr_real_1): Likewise.
2015-04-14 Alan Lawrence <alan.lawrence@arm.com>
* config/aarch64/arm_neon.h (vst1_lane_f32, vst1_lane_f64,

View File

@ -4879,7 +4879,13 @@ expand_assignment (tree to, tree from, bool nontemporal)
offset_rtx = expand_expr (offset, NULL_RTX, VOIDmode, EXPAND_SUM);
address_mode = get_address_mode (to_rtx);
if (GET_MODE (offset_rtx) != address_mode)
offset_rtx = convert_to_mode (address_mode, offset_rtx, 0);
{
/* We cannot be sure that the RTL in offset_rtx is valid outside
of a memory address context, so force it into a register
before attempting to convert it to the desired mode. */
offset_rtx = force_operand (offset_rtx, NULL_RTX);
offset_rtx = convert_to_mode (address_mode, offset_rtx, 0);
}
/* If we have an expression in OFFSET_RTX and a non-zero
byte offset in BITPOS, adding the byte offset before the
@ -10258,7 +10264,13 @@ expand_expr_real_1 (tree exp, rtx target, machine_mode tmode,
address_mode = get_address_mode (op0);
if (GET_MODE (offset_rtx) != address_mode)
offset_rtx = convert_to_mode (address_mode, offset_rtx, 0);
{
/* We cannot be sure that the RTL in offset_rtx is valid outside
of a memory address context, so force it into a register
before attempting to convert it to the desired mode. */
offset_rtx = force_operand (offset_rtx, NULL_RTX);
offset_rtx = convert_to_mode (address_mode, offset_rtx, 0);
}
/* See the comment in expand_assignment for the rationale. */
if (mode1 != VOIDmode