git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/84877 (Local stack copy of BLKmode parameter on the stack is not aligned when the requested alignment exceeds MAX_SUPPORTED_STACK_ALIGNMENT) 

PR middle-end/84877
	PR bootstrap/88450
	* function.c (assign_stack_local_1): Revert the 2018-11-21 changes.
	(assign_parm_setup_block): Do the argument slot realignment here
	instead.

From-SVN: r267812
This commit is contained in:
Jakub Jelinek 2019-01-10 16:44:16 +01:00 committed by Jakub Jelinek
parent 174f1d2642
commit d9e91ebb81
2 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2019-01-10 Jakub Jelinek <jakub@redhat.com>
PR middle-end/84877
PR bootstrap/88450
* function.c (assign_stack_local_1): Revert the 2018-11-21 changes.
(assign_parm_setup_block): Do the argument slot realignment here
instead.
2019-01-10 Stefan Agner <stefan@agner.ch>
PR target/88648

64
gcc/function.c
View File

@ -377,7 +377,6 @@ assign_stack_local_1 (machine_mode mode, poly_int64 size,
poly_int64 bigend_correction = 0;
poly_int64 slot_offset = 0, old_frame_offset;
unsigned int alignment, alignment_in_bits;
bool dynamic_align_addr = false;
if (align == 0)
{
@ -396,22 +395,14 @@ assign_stack_local_1 (machine_mode mode, poly_int64 size,
alignment_in_bits = alignment * BITS_PER_UNIT;
/* Ignore alignment if it exceeds MAX_SUPPORTED_STACK_ALIGNMENT. */
if (alignment_in_bits > MAX_SUPPORTED_STACK_ALIGNMENT)
{
/* If the required alignment exceeds MAX_SUPPORTED_STACK_ALIGNMENT and
it is not OK to reduce it. Align the slot dynamically. */
if (mode == BLKmode
&& (kind & ASLK_REDUCE_ALIGN) == 0
&& currently_expanding_to_rtl)
dynamic_align_addr = true;
else
{
alignment_in_bits = MAX_SUPPORTED_STACK_ALIGNMENT;
alignment = MAX_SUPPORTED_STACK_ALIGNMENT / BITS_PER_UNIT;
}
}
if (SUPPORTS_STACK_ALIGNMENT && !dynamic_align_addr)
if (SUPPORTS_STACK_ALIGNMENT)
{
if (crtl->stack_alignment_estimated < alignment_in_bits)
{
@ -441,42 +432,10 @@ assign_stack_local_1 (machine_mode mode, poly_int64 size,
}
}
/* Handle overalignment here for parameter copy on the stack.
Reserved enough space for it and dynamically align the address.
No free frame_space is added here. */
if (dynamic_align_addr)
{
rtx allocsize = gen_int_mode (size, Pmode);
get_dynamic_stack_size (&allocsize, 0, alignment_in_bits, NULL);
/* This is the size of space needed to accommodate required size of data
with given alignment. */
poly_int64 len = rtx_to_poly_int64 (allocsize);
old_frame_offset = frame_offset;
if (FRAME_GROWS_DOWNWARD)
{
frame_offset -= len;
try_fit_stack_local (frame_offset, len, len,
PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT,
&slot_offset);
}
else
{
frame_offset += len;
try_fit_stack_local (old_frame_offset, len, len,
PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT,
&slot_offset);
}
goto found_space;
}
else
{
if (crtl->stack_alignment_needed < alignment_in_bits)
crtl->stack_alignment_needed = alignment_in_bits;
if (crtl->max_used_stack_slot_alignment < alignment_in_bits)
crtl->max_used_stack_slot_alignment = alignment_in_bits;
}
if (mode != BLKmode || maybe_ne (size, 0))
{
@ -563,12 +522,6 @@ assign_stack_local_1 (machine_mode mode, poly_int64 size,
(slot_offset + bigend_correction,
Pmode));
if (dynamic_align_addr)
{
addr = align_dynamic_address (addr, alignment_in_bits);
mark_reg_pointer (addr, alignment_in_bits);
}
x = gen_rtx_MEM (mode, addr);
set_mem_align (x, alignment_in_bits);
MEM_NOTRAP_P (x) = 1;
@ -2960,6 +2913,19 @@ assign_parm_setup_block (struct assign_parm_data_all *all,
if (stack_parm == 0)
{
SET_DECL_ALIGN (parm, MAX (DECL_ALIGN (parm), BITS_PER_WORD));
if (DECL_ALIGN (parm) > MAX_SUPPORTED_STACK_ALIGNMENT)
{
rtx allocsize = gen_int_mode (size, Pmode);
get_dynamic_stack_size (&allocsize, 0, DECL_ALIGN (parm), NULL);
stack_parm = assign_stack_local (BLKmode, UINTVAL (allocsize),
MAX_SUPPORTED_STACK_ALIGNMENT);
rtx addr = align_dynamic_address (XEXP (stack_parm, 0),
DECL_ALIGN (parm));
mark_reg_pointer (addr, DECL_ALIGN (parm));
stack_parm = gen_rtx_MEM (GET_MODE (stack_parm), addr);
MEM_NOTRAP_P (stack_parm) = 1;
}
else
stack_parm = assign_stack_local (BLKmode, size_stored,
DECL_ALIGN (parm));
if (known_eq (GET_MODE_SIZE (GET_MODE (entry_parm)), size))