[gcc(refs/vendors/ARM/heads/morello)] In fake-capability, do not offset fake-capability DWARF register numbers

[gcc(refs/vendors/ARM/heads/morello)] In fake-capability, do not offset fake-capability DWARF register numbers

[Matthew Malcomson]

https://gcc.gnu.org/g:a7849f966e784154b206d77bea5e139e798ab25f

commit a7849f966e784154b206d77bea5e139e798ab25f
Author: Stam Markianos-Wright <stam.markianos-wright@arm.com>
Date:   Tue Mar 8 16:19:01 2022 +0000

    In fake-capability, do not offset fake-capability DWARF register numbers
    
    A simple fix to fix an ICE that I previously introduced
    to fake-capability bootstrap and regression testing.
    
    The change here is to consider TARGET_CAPABILITY_FAKE as well
    as the machine mode when deciding if to offset a reg-no
    by 198. This is to exclude fake-cap from applying the
    offset (in fake-cap we could still get here with the mode
    as CADImode, so the offset would incorrectly be applied)

Diff:
---
 gcc/config/aarch64/aarch64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index c0cf20cbea4..1d07c4fc66d 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -2199,7 +2199,7 @@ aarch64_dbx_register_number (unsigned regno, machine_mode mode)
   /* For Morello capabilities we use a separate set of DWARF registers
      in the range of 198-228 (for the c0-c30 GP registers).  */
    if (GP_REGNUM_P (regno))
-     return (CAPABILITY_MODE_P (mode) ? 198 : 0)
+     return ((CAPABILITY_MODE_P (mode) && !TARGET_CAPABILITY_FAKE) ? 198 : 0)
 	      + AARCH64_DWARF_R0 + regno - R0_REGNUM;
     /* MORELLO TODO:
     I believe we do not need to do anything here for the PCC (r230) or the