From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2063) id 223D83858CDA; Mon, 26 Sep 2022 05:34:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 223D83858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664170470; bh=E4V6R93JW2+GgRrXiDS9xif4HVFHBPWwBedQxhfO8WM=; h=From:To:Subject:Date:From; b=FS/yRXFblunux5Pl4KYDgSvNGrrmajlvsVasEWTaT6so7r/vyW03ek45dAeb1BdIb u0PFtd3+V6j4p0wKA08qUnJyUf4w/gEjy3PK60GqN0tV1NM1TgVOJ6qLi1Lx5AdYpp nrJeI/fBWIAXX7CUjOQGjaxlcsepKkCWirLZEf4I= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Kewen Lin To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2846] rs6000: Fix the condition with frame_pointer_needed_indeed [PR96072] X-Act-Checkin: gcc X-Git-Author: Kewen Lin X-Git-Refname: refs/heads/master X-Git-Oldrev: 9c9cf4f087f28dc3bf8dfa769380b3b58728a0f7 X-Git-Newrev: 5be0950d22209f5ba69d244387228e12389a8470 Message-Id: <20220926053430.223D83858CDA@sourceware.org> Date: Mon, 26 Sep 2022 05:34:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5be0950d22209f5ba69d244387228e12389a8470 commit r13-2846-g5be0950d22209f5ba69d244387228e12389a8470 Author: Kewen Lin Date: Mon Sep 26 00:33:18 2022 -0500 rs6000: Fix the condition with frame_pointer_needed_indeed [PR96072] As PR96072 shows, the code adding REG_CFA_DEF_CFA reg note makes one assumption that we have emitted one insn which restores the frame pointer previously. That part of code was guarded with flag frame_pointer_needed before, it was consistent, but it was replaced with flag frame_pointer_needed_indeed since commit r10-7981. It caused ICE due to unexpected NULL insn. PR target/96072 gcc/ChangeLog: * config/rs6000/rs6000-logue.cc (rs6000_emit_epilogue): Update the condition for adding REG_CFA_DEF_CFA reg note with frame_pointer_needed_indeed. gcc/testsuite/ChangeLog: * gcc.target/powerpc/pr96072.c: New test. Diff: --- gcc/config/rs6000/rs6000-logue.cc | 2 +- gcc/testsuite/gcc.target/powerpc/pr96072.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/config/rs6000/rs6000-logue.cc b/gcc/config/rs6000/rs6000-logue.cc index ddd849ebaf7..a11d020ccd0 100644 --- a/gcc/config/rs6000/rs6000-logue.cc +++ b/gcc/config/rs6000/rs6000-logue.cc @@ -4920,7 +4920,7 @@ rs6000_emit_epilogue (enum epilogue_type epilogue_type) a REG_CFA_DEF_CFA note, but that's OK; A duplicate is discarded by dwarf2cfi.cc/dwarf2out.cc, and in any case would be harmless if emitted. */ - if (frame_pointer_needed) + if (frame_pointer_needed_indeed) { insn = get_last_insn (); add_reg_note (insn, REG_CFA_DEF_CFA, diff --git a/gcc/testsuite/gcc.target/powerpc/pr96072.c b/gcc/testsuite/gcc.target/powerpc/pr96072.c new file mode 100644 index 00000000000..10341c91d2f --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr96072.c @@ -0,0 +1,14 @@ +/* { dg-options "-O2" } */ + +/* This used to ICE with the SYSV ABI (PR96072). */ + +void +he (int jn) +{ + { + int bh[jn]; + if (jn != 0) + goto wa; + } +wa:; +}