From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7810) id 614453857026; Thu, 27 May 2021 09:42:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 614453857026 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alex Coplan To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-8472] arm: Avoid emitting bogus CFA adjusts for CMSE nonsecure calls [PR99725] X-Act-Checkin: gcc X-Git-Author: Alex Coplan X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: f9910cefc853162aded411e06598f2a709b9f410 X-Git-Newrev: 4290ac957ce13ab6097acda4b23cfd6ecf60b782 Message-Id: <20210527094227.614453857026@sourceware.org> Date: Thu, 27 May 2021 09:42:27 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 09:42:27 -0000 https://gcc.gnu.org/g:4290ac957ce13ab6097acda4b23cfd6ecf60b782 commit r11-8472-g4290ac957ce13ab6097acda4b23cfd6ecf60b782 Author: Alex Coplan Date: Tue May 11 13:11:09 2021 +0100 arm: Avoid emitting bogus CFA adjusts for CMSE nonsecure calls [PR99725] The PR shows us attaching REG_CFA_ADJUST_CFA notes to stack pointer adjustments emitted in cmse_nonsecure_call_inline_register_clear (when -march=armv8.1-m.main). However, the stack pointer is not guaranteed to be the CFA reg. If we're at -O0 or we have -fno-omit-frame-pointer, then the frame pointer will be used as the CFA reg, and these notes on the sp adjustments will lead to ICEs in dwarf2out_frame_debug_adjust_cfa. This patch avoids emitting these notes if the current function has a frame pointer. gcc/ChangeLog: PR target/99725 * config/arm/arm.c (cmse_nonsecure_call_inline_register_clear): Avoid emitting CFA adjusts on the sp if we have the fp. gcc/testsuite/ChangeLog: PR target/99725 * gcc.target/arm/cmse/pr99725.c: New test. (cherry picked from commit 2ac1f0eb3887335b7a7e845812956fa436e72a91) Diff: --- gcc/config/arm/arm.c | 21 +++++++++++++-------- gcc/testsuite/gcc.target/arm/cmse/pr99725.c | 5 +++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 28cbb263324..d0c0c50be97 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -18795,10 +18795,14 @@ cmse_nonsecure_call_inline_register_clear (void) imm = gen_int_mode (- lazy_store_stack_frame_size, SImode); add_insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, imm)); - arm_add_cfa_adjust_cfa_note (add_insn, - - lazy_store_stack_frame_size, - stack_pointer_rtx, - stack_pointer_rtx); + /* If we have the frame pointer, then it will be the + CFA reg. Otherwise, the stack pointer is the CFA + reg, so we need to emit a CFA adjust. */ + if (!frame_pointer_needed) + arm_add_cfa_adjust_cfa_note (add_insn, + - lazy_store_stack_frame_size, + stack_pointer_rtx, + stack_pointer_rtx); emit_insn (gen_lazy_store_multiple_insn (stack_pointer_rtx)); } /* Save VFP callee-saved registers. */ @@ -18836,10 +18840,11 @@ cmse_nonsecure_call_inline_register_clear (void) rtx_insn *add_insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, imm)); - arm_add_cfa_adjust_cfa_note (add_insn, - lazy_store_stack_frame_size, - stack_pointer_rtx, - stack_pointer_rtx); + if (!frame_pointer_needed) + arm_add_cfa_adjust_cfa_note (add_insn, + lazy_store_stack_frame_size, + stack_pointer_rtx, + stack_pointer_rtx); } /* Restore VFP callee-saved registers. */ else diff --git a/gcc/testsuite/gcc.target/arm/cmse/pr99725.c b/gcc/testsuite/gcc.target/arm/cmse/pr99725.c new file mode 100644 index 00000000000..284da184f96 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/cmse/pr99725.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-mcmse -g" } */ +typedef int __attribute__((cmse_nonsecure_call)) (*t)(); +t f; +void g() { f(); }