From 76ca5ab4ef95c41c1ed67edfb34a1a455a602192 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@adacore.com>
Date: Mon, 11 Dec 2023 15:09:22 -0300
Subject: [PATCH] -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.
---
gcc/builtins.cc | 2 +-
gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 38b0acff1312..12a535d313f1 100644
--- 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
index 000000000000..fe8414559864
--- /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;
+}
--
GitLab