public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r9-10151] sparc: Preserve ORIGINAL_REGNO in epilogue_renumber [PR105257]
Date: Wed, 11 May 2022 06:26:46 +0000 (GMT)	[thread overview]
Message-ID: <20220511062646.A4B6A3856240@sourceware.org> (raw)

https://gcc.gnu.org/g:4f18893fbd53205588c952856184367671b2a880

commit r9-10151-g4f18893fbd53205588c952856184367671b2a880
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Tue Apr 19 18:58:59 2022 +0200

    sparc: Preserve ORIGINAL_REGNO in epilogue_renumber [PR105257]
    
    The following testcase ICEs, because the pic register is
    (reg:DI 24 %i0 [109]) and is used in the delay slot of a return.
    We invoke epilogue_renumber and that changes it to
    (reg:DI 8 %o0) which no longer satisfies sparc_pic_register_p
    predicate, so we don't recognize the insn anymore.
    
    The following patch fixes that by preserving ORIGINAL_REGNO if
    specified, so we get (reg:DI 8 %o0 [109]) instead.
    
    2022-04-19  Jakub Jelinek  <jakub@redhat.com>
    
            PR target/105257
            * config/sparc/sparc.c (epilogue_renumber): If ORIGINAL_REGNO,
            use gen_raw_REG instead of gen_rtx_REG and copy over also
            ORIGINAL_REGNO.  Use return 0; instead of /* fallthrough */.
    
            * gcc.dg/pr105257.c: New test.
    
    (cherry picked from commit eeca2b8bd03f57c59c6cf48bf6b9bd6dc86924f6)

Diff:
---
 gcc/config/sparc/sparc.c        | 16 ++++++++++++++--
 gcc/testsuite/gcc.dg/pr105257.c | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 6f7f3cba773..69ac39e2fb4 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -8883,8 +8883,20 @@ epilogue_renumber (register rtx *where, int test)
       if (REGNO (*where) >= 8 && REGNO (*where) < 24)      /* oX or lX */
 	return 1;
       if (! test && REGNO (*where) >= 24 && REGNO (*where) < 32)
-	*where = gen_rtx_REG (GET_MODE (*where), OUTGOING_REGNO (REGNO(*where)));
-      /* fallthrough */
+	{
+	  if (ORIGINAL_REGNO (*where))
+	    {
+	      rtx n = gen_raw_REG (GET_MODE (*where),
+				   OUTGOING_REGNO (REGNO (*where)));
+	      ORIGINAL_REGNO (n) = ORIGINAL_REGNO (*where);
+	      *where = n;
+	    }
+	  else
+	    *where = gen_rtx_REG (GET_MODE (*where),
+				  OUTGOING_REGNO (REGNO (*where)));
+	}
+      return 0;
+
     case SCRATCH:
     case CC0:
     case PC:
diff --git a/gcc/testsuite/gcc.dg/pr105257.c b/gcc/testsuite/gcc.dg/pr105257.c
new file mode 100644
index 00000000000..4232942d791
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr105257.c
@@ -0,0 +1,16 @@
+/* PR target/105257 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-fpic" { target fpic } } */
+
+extern int sigsetjmp (void **, int);
+void *buf[32];
+void (*fn) (void);
+
+const char *
+bar (void)
+{
+  sigsetjmp (buf, 0);
+  fn ();
+  return "";
+}


                 reply	other threads:[~2022-05-11  6:26 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220511062646.A4B6A3856240@sourceware.org \
    --to=jakub@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).