From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
Date: Tue, 25 Oct 2022 13:53:23 +0000 (+0800)
Subject: RISC-V: Fix epilogue generation for barrier.
X-Git-Tag: basepoints/gcc-14~3701
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4329d111f48cba9ea560fc0a36f4cb5a290decb2;p=thirdparty%2Fgcc.git

RISC-V: Fix epilogue generation for barrier.

 I noticed that I have made a mistake in previous patch:
 https://patchwork.sourceware.org/project/gcc/patch/20220817071950.271762-1-juzhe.zhong@rivai.ai/

 The previous statement before this patch:
 bool need_barrier_p = (get_frame_size () + cfun->machine->frame.arg_pointer_offset) != 0;

 However, I changed it in the previous patch:
 bool need_barrier_p = known_ne (get_frame_size (), cfun->machine->frame.arg_pointer_offset);
 This is incorrect.

 Now, I correct this statement in this patch.

gcc/ChangeLog:

	* config/riscv/riscv.cc (riscv_expand_epilogue): Fix statement.
---

diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index fac8def31d85..3d02954ffce9 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -5025,8 +5025,8 @@ riscv_expand_epilogue (int style)
   rtx insn;
 
   /* We need to add memory barrier to prevent read from deallocated stack.  */
-  bool need_barrier_p
-    = known_ne (get_frame_size (), cfun->machine->frame.arg_pointer_offset);
+  bool need_barrier_p = known_ne (get_frame_size ()
+				  + cfun->machine->frame.arg_pointer_offset, 0);
 
   if (cfun->machine->naked_p)
     {