aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2002-03-25 12:34:11 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2002-03-25 12:34:11 +0100
commit6ddae612862ce6cf65cfeddac2d0959d7397d0be (patch)
tree3f696f0ff6c9196d8903fb35f20fb615915ea88d /gcc
parent9035ec7952324e5b2a4b17cfc86db62c44d008a3 (diff)
downloadgcc-6ddae612862ce6cf65cfeddac2d0959d7397d0be.zip
gcc-6ddae612862ce6cf65cfeddac2d0959d7397d0be.tar.gz
gcc-6ddae612862ce6cf65cfeddac2d0959d7397d0be.tar.bz2
re PR target/6043 (IICE on ia64 for Blitz config test for C++ complex math)
PR target/6043 * expr.c (emit_group_store): Handle storing into CONCAT. * g++.dg/opt/conj2.C: New test. From-SVN: r51311
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/expr.c22
-rw-r--r--gcc/testsuite/ChangeLog2
-rw-r--r--gcc/testsuite/g++.dg/opt/conj2.C23
4 files changed, 48 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9998544..613342a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2002-03-25 Jakub Jelinek <jakub@redhat.com>
+ PR target/6043
+ * expr.c (emit_group_store): Handle storing into CONCAT.
+
+2002-03-25 Jakub Jelinek <jakub@redhat.com>
+
* regrename.c (build_def_use): Share RTL between MATCH_OPERATOR and
corresponding MATCH_DUP.
diff --git a/gcc/expr.c b/gcc/expr.c
index 3913ebd..e6821d5 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2113,6 +2113,7 @@ emit_group_store (orig_dst, src, ssize)
HOST_WIDE_INT bytepos = INTVAL (XEXP (XVECEXP (src, 0, i), 1));
enum machine_mode mode = GET_MODE (tmps[i]);
unsigned int bytelen = GET_MODE_SIZE (mode);
+ rtx dest = dst;
/* Handle trailing fragments that run over the size of the struct. */
if (ssize >= 0 && bytepos + (HOST_WIDE_INT) bytelen > ssize)
@@ -2126,14 +2127,27 @@ emit_group_store (orig_dst, src, ssize)
bytelen = ssize - bytepos;
}
+ if (GET_CODE (dst) == CONCAT)
+ {
+ if (bytepos + bytelen <= GET_MODE_SIZE (GET_MODE (XEXP (dst, 0))))
+ dest = XEXP (dst, 0);
+ else if (bytepos >= GET_MODE_SIZE (GET_MODE (XEXP (dst, 0))))
+ {
+ bytepos -= GET_MODE_SIZE (GET_MODE (XEXP (dst, 0)));
+ dest = XEXP (dst, 1);
+ }
+ else
+ abort ();
+ }
+
/* Optimize the access just a bit. */
- if (GET_CODE (dst) == MEM
- && MEM_ALIGN (dst) >= GET_MODE_ALIGNMENT (mode)
+ if (GET_CODE (dest) == MEM
+ && MEM_ALIGN (dest) >= GET_MODE_ALIGNMENT (mode)
&& bytepos * BITS_PER_UNIT % GET_MODE_ALIGNMENT (mode) == 0
&& bytelen == GET_MODE_SIZE (mode))
- emit_move_insn (adjust_address (dst, mode, bytepos), tmps[i]);
+ emit_move_insn (adjust_address (dest, mode, bytepos), tmps[i]);
else
- store_bit_field (dst, bytelen * BITS_PER_UNIT, bytepos * BITS_PER_UNIT,
+ store_bit_field (dest, bytelen * BITS_PER_UNIT, bytepos * BITS_PER_UNIT,
mode, tmps[i], ssize);
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0ec9af50..8a22162 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,8 @@
* gcc.c-torture/compile/20020323-1.c: New test.
+ * g++.dg/opt/conj2.C: New test.
+
2002-03-24 Richard Henderson <rth@redhat.com>
* gcc.dg/weak-1.c: Use -fno-common.
diff --git a/gcc/testsuite/g++.dg/opt/conj2.C b/gcc/testsuite/g++.dg/opt/conj2.C
new file mode 100644
index 0000000..25e832a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/conj2.C
@@ -0,0 +1,23 @@
+// PR target/6043
+// This testcase ICEd on IA-64 because emit_group_store
+// did not handle loading CONCAT from register group
+// { dg-do compile }
+
+struct C
+{
+ C (double y, double z) { __real__ x = y; __imag__ x = z; }
+ double r () const { return __real__ x; }
+ double i () const { return __imag__ x; }
+ __complex__ double x;
+};
+
+inline C conj (const C& x)
+{
+ return C (x.r (), - x.i ());
+}
+
+void foo (void)
+{
+ C x (1.0, 1.0);
+ conj (x);
+}