aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMikael Pettersson <mikpe@it.uu.se>2011-01-27 05:25:49 +0100
committerJeff Law <law@gcc.gnu.org>2011-01-26 21:25:49 -0700
commit3b8ff89fa6f454d7b8ae81e3aaf45fa67a866ed2 (patch)
tree45ee964249b55af1bfcdd3579663480715ec0f6b /gcc
parent434b897293cc5fc065a5ecb1536171520887adc4 (diff)
downloadgcc-3b8ff89fa6f454d7b8ae81e3aaf45fa67a866ed2.zip
gcc-3b8ff89fa6f454d7b8ae81e3aaf45fa67a866ed2.tar.gz
gcc-3b8ff89fa6f454d7b8ae81e3aaf45fa67a866ed2.tar.bz2
re PR rtl-optimization/46856 (internal compiler error in final_scan_insn breaks m68k-linux bootstrap)
PR rtl-optimization/46856 * postreload.c (reload_combine_recognize_const_pattern): Do not separate cc0 setter and user on cc0 targets. PR rtl-optimization/46856 * gcc.c-torture/compile/pr46856.c: New test. From-SVN: r169321
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/postreload.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr46856.c26
4 files changed, 43 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0389d4..207e618 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-26 Mikael Pettersson <mikpe@it.uu.se>
+
+ PR rtl-optimization/46856
+ * postreload.c (reload_combine_recognize_const_pattern): Do not
+ separate cc0 setter and user on cc0 targets.
+
2011-01-26 Nicola Pero <nicola.pero@meta-innovation.com>
PR c/43082
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 15c22e2..1cb42f6 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -1009,6 +1009,12 @@ reload_combine_recognize_const_pattern (rtx insn)
&& reg_state[clobbered_regno].real_store_ruid >= use_ruid)
break;
+#ifdef HAVE_cc0
+ /* Do not separate cc0 setter and cc0 user on HAVE_cc0 targets. */
+ if (must_move_add && sets_cc0_p (PATTERN (use_insn)))
+ break;
+#endif
+
gcc_assert (reg_state[regno].store_ruid <= use_ruid);
/* Avoid moving a use of ADDREG past a point where it is stored. */
if (reg_state[REGNO (addreg)].store_ruid > use_ruid)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6835c19..4414684 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26 Mikael Pettersson <mikpe@it.uu.se>
+
+ PR rtl-optimization/46856
+ * gcc.c-torture/compile/pr46856.c: New test.
+
2011-01-26 Nicola Pero <nicola.pero@meta-innovation.com>
Andrew Pinski <pinskia@gmail.com>
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr46856.c b/gcc/testsuite/gcc.c-torture/compile/pr46856.c
new file mode 100644
index 0000000..2ec5e8b
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr46856.c
@@ -0,0 +1,26 @@
+struct data {
+ int prio;
+ signed char status;
+};
+
+struct base {
+ unsigned _num;
+ struct data vec[10];
+};
+
+static struct data *ix(struct base *base, unsigned i)
+{
+ return &base->vec[i];
+}
+
+struct heap {
+ struct base base;
+};
+
+struct heap *heap;
+
+void increase_insn_priority (int *fld, int amount)
+{
+ if (ix(heap ? &heap->base : 0, *fld)->status > 0)
+ ix(heap ? &heap->base : 0, *fld)->prio += amount;
+}