[gcc(refs/users/aoliva/heads/testme)] -finline-stringops: don't assume ptr_mode ptr in memset [PR112804]

[gcc(refs/users/aoliva/heads/testme)] -finline-stringops: don't assume ptr_mode ptr in memset [PR112804]

[Alexandre Oliva]

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

commit aed637da6b3e9b09de3ddff18a60ee6ac07beea3
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Fri Dec 8 21:41:50 2023 -0300

    -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:
---
 gcc/builtins.cc                                            | 2 +-
 gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 38b0acff131..12a535d313f 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 00000000000..fe841455986
--- /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;
+}

[gcc(refs/users/aoliva/heads/testme)] -finline-stringops: don't assume ptr_mode ptr in memset [PR112804]

[Alexandre Oliva]

https://gcc.gnu.org/g:458fdd7209a361679e75fc57a2544b4d7f40077d

commit 458fdd7209a361679e75fc57a2544b4d7f40077d
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Fri Dec 8 21:41:50 2023 -0300

    -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:
---
 gcc/builtins.cc                                            | 2 +-
 gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 38b0acff131..12a535d313f 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 00000000000..fe841455986
--- /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;
+}

[gcc(refs/users/aoliva/heads/testme)] -finline-stringops: don't assume ptr_mode ptr in memset [PR112804]

[Alexandre Oliva]

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

commit fcf66065b6d7865aeff47678db37670e4575a95d
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Fri Dec 8 21:41:50 2023 -0300

    -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:
---
 gcc/builtins.cc                                            | 2 +-
 gcc/testsuite/gcc.target/aarch64/inline-mem-set-pr112804.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index d5135ca162a..4c3a93fb42f 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -4548,7 +4548,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..fe841455986
--- /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;
+}