[v2] PR target/89828 Inernal compiler error on -fno-omit-frame-pointer
Commit Message
What about this?
It no longer occurs for me.
gcc/config/rx/
* rx.cc (add_pop_cfi_notes): Release the frame pointer if it is used.
(rx_expand_prologue): Redesigned stack pointer and frame pointer update process.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
gcc/config/rx/rx.cc | 50 +++++++++++++++------------------------------
1 file changed, 17 insertions(+), 33 deletions(-)
Comments
On 3/15/23 01:51, Yoshinori Sato wrote:
> What about this?
> It no longer occurs for me.
>
> gcc/config/rx/
> * rx.cc (add_pop_cfi_notes): Release the frame pointer if it is used.
> (rx_expand_prologue): Redesigned stack pointer and frame pointer update process.
That fixes the problems building newlib. It also fixes roughly 300
failures in the testsuite (primarily fixing ICEs in
dwarf2out_frame_debug_adjust_cfa).
So the next step is to sit down with the code and review it :-)
jeff
On 3/15/23 01:51, Yoshinori Sato wrote:
> What about this?
> It no longer occurs for me.
>
> gcc/config/rx/
> * rx.cc (add_pop_cfi_notes): Release the frame pointer if it is used.
> (rx_expand_prologue): Redesigned stack pointer and frame pointer update process.
So I think the ChangeLog entry needs a bit of work. I don't see how
the ChangeLog entry for add_pop_cfi_notes relates to the changes at all.
This might be better:
* config/rx/rx.cc (add_pop_cfi_notes): Attach CFA_RESTORE notes
first, then the CFA_ADJUST_CFA note. If restoring the frame
pointer, use (fp + offset) for the CFA_ADJUST_CFA note.
> @@ -1815,37 +1819,17 @@ rx_expand_prologue (void)
> }
> }
>
> - /* If needed, set up the frame pointer. */
> - if (frame_pointer_needed)
> - gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
> - GEN_INT (- (HOST_WIDE_INT) frame_size), true);
> -
> - /* Allocate space for the outgoing args.
> - If the stack frame has not already been set up then handle this as well. */
> - if (stack_size)
> + if (stack_size || frame_size)
> {
> - if (frame_size)
> - {
> - if (frame_pointer_needed)
> - gen_safe_add (stack_pointer_rtx, frame_pointer_rtx,
> - GEN_INT (- (HOST_WIDE_INT) stack_size), true);
> - else
> - gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
> - GEN_INT (- (HOST_WIDE_INT) (frame_size + stack_size)),
> - true);
> - }
> - else
> - gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
> - GEN_INT (- (HOST_WIDE_INT) stack_size), true);
> + gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
> + GEN_INT (- (HOST_WIDE_INT) (stack_size + frame_size)),
> + true);
> }
> - else if (frame_size)
> + if (frame_pointer_needed)
> {
> - if (! frame_pointer_needed)
> - gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
> - GEN_INT (- (HOST_WIDE_INT) frame_size), true);
> - else
> - gen_safe_add (stack_pointer_rtx, frame_pointer_rtx, NULL_RTX,
> - false /* False because the epilogue will use the FP not the SP. */);
> + gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
> + GEN_INT ((HOST_WIDE_INT) stack_size),
> + true);
It looks like we're emitting;
(set (sp) (plus (sp) (stack_size + frame_size)
Then we emit
(set (fp) (plus (sp) (stack_size))
Unless I missing something important, that seems wrong and results in
stack_size being added to FP twice.
jeff
@@ -1647,16 +1647,20 @@ mark_frame_related (rtx insn)
static void
add_pop_cfi_notes (rtx_insn *insn, unsigned int high, unsigned int low)
{
- rtx t = plus_constant (Pmode, stack_pointer_rtx,
- (high - low + 1) * UNITS_PER_WORD);
+ rtx src = stack_pointer_rtx;
+ rtx t;
+ for (unsigned int i = low; i <= high; i++)
+ {
+ add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (word_mode, i));
+ if (i == FRAME_POINTER_REGNUM && frame_pointer_needed)
+ src = frame_pointer_rtx;
+ }
+ t = plus_constant (Pmode, src, (high - low + 1) * UNITS_PER_WORD);
t = gen_rtx_SET (stack_pointer_rtx, t);
add_reg_note (insn, REG_CFA_ADJUST_CFA, t);
RTX_FRAME_RELATED_P (insn) = 1;
- for (unsigned int i = low; i <= high; i++)
- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (word_mode, i));
}
-
static bool
ok_for_max_constant (HOST_WIDE_INT val)
{
@@ -1815,37 +1819,17 @@ rx_expand_prologue (void)
}
}
- /* If needed, set up the frame pointer. */
- if (frame_pointer_needed)
- gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) frame_size), true);
-
- /* Allocate space for the outgoing args.
- If the stack frame has not already been set up then handle this as well. */
- if (stack_size)
+ if (stack_size || frame_size)
{
- if (frame_size)
- {
- if (frame_pointer_needed)
- gen_safe_add (stack_pointer_rtx, frame_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) stack_size), true);
- else
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) (frame_size + stack_size)),
- true);
- }
- else
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) stack_size), true);
+ gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
+ GEN_INT (- (HOST_WIDE_INT) (stack_size + frame_size)),
+ true);
}
- else if (frame_size)
+ if (frame_pointer_needed)
{
- if (! frame_pointer_needed)
- gen_safe_add (stack_pointer_rtx, stack_pointer_rtx,
- GEN_INT (- (HOST_WIDE_INT) frame_size), true);
- else
- gen_safe_add (stack_pointer_rtx, frame_pointer_rtx, NULL_RTX,
- false /* False because the epilogue will use the FP not the SP. */);
+ gen_safe_add (frame_pointer_rtx, stack_pointer_rtx,
+ GEN_INT ((HOST_WIDE_INT) stack_size),
+ true);
}
}