From defa8681d951c6d6c43c71e3636ce4db9de04a28 Mon Sep 17 00:00:00 2001 From: Kito Cheng Date: Tue, 14 Nov 2023 11:17:45 +0800 Subject: [PATCH] RISC-V: Save/restore ra register correctly [PR112478] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We set ra to fixed register now, but we still need to save/restore that at prologue/epilogue if that has used. gcc/ChangeLog: PR target/112478 * config/riscv/riscv.cc (riscv_save_return_addr_reg_p): Check ra is ever lived. gcc/testsuite/ChangeLog: PR target/112478 * gcc.target/riscv/pr112478.c: New. Reviewed-by: Christoph Müllner Tested-by: Christoph Müllner --- gcc/config/riscv/riscv.cc | 4 ++++ gcc/testsuite/gcc.target/riscv/pr112478.c | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/pr112478.c diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index e466d4f168af..aada6ac76c8b 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -5825,6 +5825,10 @@ riscv_save_return_addr_reg_p (void) if (riscv_far_jump_used_p ()) return true; + /* We need to save it if anyone has used that. */ + if (df_regs_ever_live_p (RETURN_ADDR_REGNUM)) + return true; + /* Need not to use ra for leaf when frame pointer is turned off by option whatever the omit-leaf-frame's value. */ if (frame_pointer_needed && crtl->is_leaf diff --git a/gcc/testsuite/gcc.target/riscv/pr112478.c b/gcc/testsuite/gcc.target/riscv/pr112478.c new file mode 100644 index 000000000000..0bbde20b71bc --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/pr112478.c @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-ffat-lto-objects" } */ + +void foo() { + asm volatile("# " : ::"ra"); +} + +/* { dg-final { scan-assembler "s(w|d)\[ \t\]*ra" } } */ -- 2.47.2