From 7f7211fb3fafede9ca157d5bceb3e7a0bc9cc74b Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 23 Dec 2009 18:04:07 +0100
Subject: [PATCH] re PR rtl-optimization/42475 (ICE at -O1 and above: internal
compiler error: in simplify_subreg, at simplify-rtx.c:4954)
PR rtl-optimization/42475
* combine.c (make_compound_operation) <case SUBREG>: Use mode of
SUBREG_REG (x) instead of tem's mode.
* gcc.dg/pr42475.c: New test.
From-SVN: r155430
---
gcc/ChangeLog | 6 ++++++
gcc/combine.c | 7 +++----
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.dg/pr42475.c | 28 ++++++++++++++++++++++++++++
4 files changed, 42 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/pr42475.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42c4e1c085cf..f60a33cf5b45 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-23 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/42475
+ * combine.c (make_compound_operation) <case SUBREG>: Use mode of
+ SUBREG_REG (x) instead of tem's mode.
+
2009-12-23 Jakub Jelinek <jakub@redhat.com>
Cary Coutant <ccoutant@google.com>
diff --git a/gcc/combine.c b/gcc/combine.c
index 2c60ae5640fb..5ae557c180af 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -7306,15 +7306,14 @@ make_compound_operation (rtx x, enum rtx_code in_code)
tem = make_compound_operation (SUBREG_REG (x), in_code);
{
- rtx simplified;
- simplified = simplify_subreg (GET_MODE (x), tem, GET_MODE (tem),
- SUBREG_BYTE (x));
+ rtx simplified = simplify_subreg (mode, tem, GET_MODE (SUBREG_REG (x)),
+ SUBREG_BYTE (x));
if (simplified)
tem = simplified;
if (GET_CODE (tem) != GET_CODE (SUBREG_REG (x))
- && GET_MODE_SIZE (mode) < GET_MODE_SIZE (GET_MODE (tem))
+ && GET_MODE_SIZE (mode) < GET_MODE_SIZE (GET_MODE (SUBREG_REG (x)))
&& subreg_lowpart_p (x))
{
rtx newer = force_to_mode (tem, mode, ~(HOST_WIDE_INT) 0,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 83144a258f2e..98d85f4465f9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-23 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/42475
+ * gcc.dg/pr42475.c: New test.
+
2009-12-23 Jakub Jelinek <jakub@redhat.com>
Cary Coutant <ccoutant@google.com>
diff --git a/gcc/testsuite/gcc.dg/pr42475.c b/gcc/testsuite/gcc.dg/pr42475.c
new file mode 100644
index 000000000000..a5edffa78eba
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr42475.c
@@ -0,0 +1,28 @@
+/* PR rtl-optimization/42475 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+typedef struct { float x, y; } B;
+typedef struct { float z; } C;
+typedef struct { B b; C c; } D;
+
+B
+foo (float x, float y)
+{
+ B b = { .x = x, .y = y };
+ return b;
+}
+
+B
+bar (B b, B y)
+{
+ return foo (y.x + b.x, b.y);
+}
+
+B
+baz (D p)
+{
+ D d = { };
+ B y = bar (foo (0, (p.c.z) / 2), d.b);
+ return y;
+}
--
GitLab