[gcc(refs/users/aoliva/heads/testme)] -finline-stringops: convert ptr to ptr_mode in memset [PR112804]

[Alexandre Oliva]

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

commit e822e7e8655a6a08bfe4a379d231a50f4d6fd7e0
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Thu Dec 7 20:41:49 2023 -0300

    -finline-stringops: convert ptr to ptr_mode in memset [PR112804]

Diff:
---
 gcc/builtins.cc                                            | 4 ++--
 gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index afa9be51443..06364024c0b 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -4451,7 +4451,7 @@ try_store_by_multiple_pieces (rtx to, rtx len, unsigned int ctz_len,
       constfundata = &valc;
     }
 
-  rtx ptr = copy_addr_to_reg (XEXP (to, 0));
+  rtx ptr = copy_addr_to_reg (convert_to_mode (ptr_mode, XEXP (to, 0)));
   rtx rem = copy_to_mode_reg (ptr_mode, convert_to_mode (ptr_mode, len, 0));
   to = replace_equiv_address (to, ptr);
   set_mem_align (to, align);
@@ -4519,7 +4519,7 @@ try_store_by_multiple_pieces (rtx to, rtx len, unsigned int ctz_len,
 	  to = change_address (to, QImode, 0);
 	  emit_move_insn (to, val);
 	  if (update_needed)
-	    next_ptr = plus_constant (ptr_mode, ptr, blksize);
+	    next_ptr = plus_constant (GET_MODE (ptr), ptr, blksize);
 	}
       else
 	{
diff --git a/gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c b/gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c
new file mode 100644
index 00000000000..c8782ba7034
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c
@@ -0,0 +1,7 @@
+/* { dg-do compile } */
+/* { dg-options "-finline-stringops -mabi=ilp32 -ftrivial-auto-var-init=zero" } */
+
+short m(unsigned k) {
+  const unsigned short *n[65];
+  return 0
+}