[gcc r11-7572] Checked in non-final version of patch in commit 9433c844c8bcf0166567943b45576ceeeee0b131

[gcc r11-7572] Checked in non-final version of patch in commit 9433c844c8bcf0166567943b45576ceeeee0b131

[Aaron Sawdey]

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

commit r11-7572-ge5cdf6968b40df0f59faa4af8fe26ce6fb9162cd
Author: Aaron Sawdey <acsawdey@linux.ibm.com>
Date:   Mon Mar 8 22:18:03 2021 -0600

    Checked in non-final version of patch in commit 9433c844c8bcf0166567943b45576ceeeee0b131
    
    Not sure what I did but this corrects it to the version that I tested
    and that Segher approved.
    
    gcc/ChangeLog
            * config/rs6000/predicates.md (ds_form_mem_operand): Check
            in correct code.

Diff:
---
 gcc/config/rs6000/predicates.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 1556514263a..69f3c709abb 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -998,16 +998,10 @@
 (define_predicate "ds_form_mem_operand"
   (match_code "subreg,mem")
 {
-  rtx inner, addr, offset;
-
-  inner = op;
-  if (reload_completed && SUBREG_P (inner))
-    inner = SUBREG_REG (inner);
-
-  if (!any_memory_operand (inner, mode))
+  if (!any_memory_operand (op, mode))
     return false;
 
-  addr = XEXP (inner, 0);
+  rtx addr = XEXP (op, 0);
 
   return address_to_insn_form (addr, mode, NON_PREFIXED_DS) == INSN_FORM_DS;
 })