aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2022-04-22 13:38:11 +0200
committerJakub Jelinek <jakub@redhat.com>2022-04-22 13:38:11 +0200
commit7092b7aea122a91824d048aeb23834cf1d19b1a1 (patch)
treeeb6712fec07d8cb32129652226f5be2eade6d0c4
parentc1a9cf679153719d066f1ec79154c406e1e48cdf (diff)
downloadgcc-7092b7aea122a91824d048aeb23834cf1d19b1a1.zip
gcc-7092b7aea122a91824d048aeb23834cf1d19b1a1.tar.gz
gcc-7092b7aea122a91824d048aeb23834cf1d19b1a1.tar.bz2
rtlanal: Fix up replace_rtx [PR105333]
The following testcase FAILs, because replace_rtx replaces a REG with CONST_WIDE_INT inside of a SUBREG, which is an invalid transformation because a SUBREG relies on SUBREG_REG having non-VOIDmode but CONST_WIDE_INT has VOIDmode. replace_rtx already has code to deal with it, but it was doing it only for CONST_INTs. The following patch does it also for VOIDmode CONST_DOUBLE or CONST_WIDE_INT. 2022-04-22 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/105333 * rtlanal.cc (replace_rtx): Use simplify_subreg or simplify_unary_operation if CONST_SCALAR_INT_P rather than just CONST_INT_P. * gcc.dg/pr105333.c: New test.
-rw-r--r--gcc/rtlanal.cc4
-rw-r--r--gcc/testsuite/gcc.dg/pr105333.c21
2 files changed, 23 insertions, 2 deletions
diff --git a/gcc/rtlanal.cc b/gcc/rtlanal.cc
index e1824bf..c436c64 100644
--- a/gcc/rtlanal.cc
+++ b/gcc/rtlanal.cc
@@ -3390,7 +3390,7 @@ replace_rtx (rtx x, rtx from, rtx to, bool all_regs)
{
rtx new_rtx = replace_rtx (SUBREG_REG (x), from, to, all_regs);
- if (CONST_INT_P (new_rtx))
+ if (CONST_SCALAR_INT_P (new_rtx))
{
x = simplify_subreg (GET_MODE (x), new_rtx,
GET_MODE (SUBREG_REG (x)),
@@ -3406,7 +3406,7 @@ replace_rtx (rtx x, rtx from, rtx to, bool all_regs)
{
rtx new_rtx = replace_rtx (XEXP (x, 0), from, to, all_regs);
- if (CONST_INT_P (new_rtx))
+ if (CONST_SCALAR_INT_P (new_rtx))
{
x = simplify_unary_operation (ZERO_EXTEND, GET_MODE (x),
new_rtx, GET_MODE (XEXP (x, 0)));
diff --git a/gcc/testsuite/gcc.dg/pr105333.c b/gcc/testsuite/gcc.dg/pr105333.c
new file mode 100644
index 0000000..bd8bd4c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr105333.c
@@ -0,0 +1,21 @@
+/* PR rtl-optimization/105333 */
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-Og -fno-tree-coalesce-vars -fno-tree-fre" } */
+
+int g;
+short s;
+
+static inline unsigned short
+bar (short a, __int128 b)
+{
+ b ^= (unsigned long) -a;
+ __builtin_strncpy ((void *) &s, (void *) &a, 1);
+ b *= 14;
+ return b;
+}
+
+void
+foo (void)
+{
+ g *= (__int128) bar (1, 1);
+}