aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2012-11-19 23:28:04 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2012-11-19 23:28:04 +0000
commit0343822bd86552c0264836a6d6f0927bf39c87b1 (patch)
tree93122eaac614328a2889483eabeeb9a843d1337d
parent0e8330d91d13ed0200ef902c596d349ab1969d19 (diff)
downloadgcc-0343822bd86552c0264836a6d6f0927bf39c87b1.zip
gcc-0343822bd86552c0264836a6d6f0927bf39c87b1.tar.gz
gcc-0343822bd86552c0264836a6d6f0927bf39c87b1.tar.bz2
re PR middle-end/55359 (ICE in simplify_subreg accessing an unaligned subvector)
gcc/ PR middle-end/55359 * simplify-rtx.c (simplify_subreg): Return null for invalid offsets. gcc/testsuite/ * gcc.target/i386/pr55359.c: New test. From-SVN: r193640
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/simplify-rtx.c7
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.target/i386/pr55359.c10
4 files changed, 24 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46d471f..dcb56bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-19 Richard Sandiford <rdsandiford@googlemail.com>
+
+ PR middle-end/55359
+ * simplify-rtx.c (simplify_subreg): Return null for invalid offsets.
+
2012-11-19 Aldy Hernandez <aldyh@redhat.com>
* trans-mem.c (execute_tm_mark): Release bb_regions.
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 18223a8..46d9e8a 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -5685,8 +5685,11 @@ simplify_subreg (enum machine_mode outermode, rtx op,
gcc_assert (GET_MODE (op) == innermode
|| GET_MODE (op) == VOIDmode);
- gcc_assert ((byte % GET_MODE_SIZE (outermode)) == 0);
- gcc_assert (byte < GET_MODE_SIZE (innermode));
+ if ((byte % GET_MODE_SIZE (outermode)) != 0)
+ return NULL_RTX;
+
+ if (byte >= GET_MODE_SIZE (innermode))
+ return NULL_RTX;
if (outermode == innermode && !byte)
return op;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e5bafaa..5148099 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * gcc.target/i386/pr55359.c: New test.
+
2012-11-19 Eric Botcazou <ebotcazou@adacore.com>
* g++.dg/tls/thread_local-order1.C: Add dg-require-cxa-atexit.
diff --git a/gcc/testsuite/gcc.target/i386/pr55359.c b/gcc/testsuite/gcc.target/i386/pr55359.c
new file mode 100644
index 0000000..222affc
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr55359.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-mavx2 -O2" } */
+
+#include <x86intrin.h>
+
+__m128d
+f (__m256d x)
+{
+ return *((__m128d*) ((double *) &x + 1));
+}