From: Indu Bhagat <indu.bhagat@oracle.com>
Date: Fri, 14 Nov 2025 06:49:14 +0000 (-0800)
Subject: Revert "gas: Don't skip SFrame FDE if .cfi_register specifies RA w/o tracking"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc185e2d05e2b7600138943669ae7791803720a;p=thirdparty%2Fbinutils-gdb.git

Revert "gas: Don't skip SFrame FDE if .cfi_register specifies RA w/o tracking"

This reverts commit df174a6b760ac5c66ee62ecb872c760ae21fd4cd.

    commit df174a6b760ac5c66ee62ecb872c760ae21fd4cd
    Date:   Thu Jul 4 10:34:12 2024 +0200

    gas: Don't skip SFrame FDE if .cfi_register specifies RA w/o tracking

    Do not skip SFrame FDE if .cfi_register specifies RA register without
    RA tracking being actually used. Without RA tracking the register
    contents can always be restored from the stack using the fixed
    RA offset from CFA.

Even for ABI/arch without RA tracking, there may be instances where user
may specify '.cfi_register RA, reg'.  This needs to be caught, skipping
this from SFrame generation may not be correct.  This may be done in
certain hand-written asm sequences where the user needs to manipulate
the return to a certain function.

A later commit will add a testcase for documentation purposes.
---

diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c
index 0d6edd362cb..eead58b00f6 100644
--- a/gas/gen-sframe.c
+++ b/gas/gen-sframe.c
@@ -1281,7 +1281,7 @@ sframe_xlate_do_register (struct sframe_xlate_ctx *xlate_ctx,
      instruction can be safely skipped without sacrificing the asynchronicity of
      stack trace information.  */
   if (cfi_insn->u.rr.reg1 == SFRAME_CFA_FP_REG
-      || (sframe_ra_tracking_p () && cfi_insn->u.rr.reg1 == SFRAME_CFA_RA_REG)
+      || cfi_insn->u.rr.reg1 == SFRAME_CFA_RA_REG
       /* Ignore SP reg, as it can be recovered from the CFA tracking info.  */
       )
     {