-finline-stringops: don't assume ptr_mode ptr in memset [PR112804]

On aarch64 -milp32, and presumably on other such targets, ptr can be
in a different mode than ptr_mode in the testcase.  Cope with it.

for  gcc/ChangeLog

	PR target/112804
	* builtins.cc (try_store_by_multiple_pieces): Use ptr's mode
	for the increment.

for  gcc/testsuite/ChangeLog

	PR target/112804
	* gcc.target/aarch64/inline-mem-set-pr112804.c: New.

diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 38b0acff131249579c39d397e40107deddef56b8..12a535d313f12c574042275dd0550114df74bb48 100644 (file)
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -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 (file)
index 0000000..fe84145
--- /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;
+}