aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2023-03-02 10:30:21 +0000
committerRichard Sandiford <richard.sandiford@arm.com>2023-03-02 10:30:21 +0000
commitb09dc74801cf4e19bdf5fcd18a5cd53fc9e9ca9a (patch)
treed54c037431eb57c378a7e84a16a197956da69762
parent2a8ce4b52f5892a10a02b94d7be689e59a444ff6 (diff)
downloadgcc-b09dc74801cf4e19bdf5fcd18a5cd53fc9e9ca9a.zip
gcc-b09dc74801cf4e19bdf5fcd18a5cd53fc9e9ca9a.tar.gz
gcc-b09dc74801cf4e19bdf5fcd18a5cd53fc9e9ca9a.tar.bz2
Avoid creating (const (reg ...)) [PR108603]
convert_memory_address_addr_space_1 has two modes: one in which it tries to create a self-contained RTL expression (which might fail) and one in which it can emit new instructions where necessary. When handling a CONST, the function recurses into the CONST's operand and then constifies the result. But that's only valid if the result is still a self-contained expression. If new instructions have been emitted, the expression will refer to the (non-constant) results of those instructions. In the PR, this caused us to emit a nonsensical (const (reg ...)) REG_EQUAL note. gcc/ PR tree-optimization/108603 * explow.cc (convert_memory_address_addr_space_1): Only wrap the result of a recursive call in a CONST if no instructions were emitted. gcc/testsuite/ PR tree-optimization/108603 * gcc.target/aarch64/sve/pr108603.c: New test.
-rw-r--r--gcc/explow.cc11
-rw-r--r--gcc/testsuite/gcc.target/aarch64/sve/pr108603.c8
2 files changed, 16 insertions, 3 deletions
diff --git a/gcc/explow.cc b/gcc/explow.cc
index 83439b3..32e9498 100644
--- a/gcc/explow.cc
+++ b/gcc/explow.cc
@@ -349,9 +349,14 @@ convert_memory_address_addr_space_1 (scalar_int_mode to_mode ATTRIBUTE_UNUSED,
return temp;
case CONST:
- temp = convert_memory_address_addr_space_1 (to_mode, XEXP (x, 0), as,
- true, no_emit);
- return temp ? gen_rtx_CONST (to_mode, temp) : temp;
+ {
+ auto *last = no_emit ? nullptr : get_last_insn ();
+ temp = convert_memory_address_addr_space_1 (to_mode, XEXP (x, 0), as,
+ true, no_emit);
+ if (temp && (no_emit || last == get_last_insn ()))
+ return gen_rtx_CONST (to_mode, temp);
+ return temp;
+ }
case PLUS:
case MULT:
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr108603.c b/gcc/testsuite/gcc.target/aarch64/sve/pr108603.c
new file mode 100644
index 0000000..a2aea9f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr108603.c
@@ -0,0 +1,8 @@
+/* { dg-options "-O2 -mabi=ilp32 -fdata-sections" } */
+
+int a[128];
+long long *p;
+void f() {
+ for (long i = 0; i < sizeof(long); i++)
+ p[i] = a[i];
+}