aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gcse.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/20071118-1.c17
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3b5f84..cf958d1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2007-11-18 Jakub Jelinek <jakub@redhat.com>
+ PR rtl-optimization/34132
+ * gcse.c (try_replace_reg): Avoid rtx sharing between REG_EQUAL note
+ and insn.
+
PR middle-end/33335
* optabs.h (optab_table): Change type to struct optab from optab.
(convert_optab_table): Similarly.
diff --git a/gcc/gcse.c b/gcc/gcse.c
index c5e8c7b..84c0994 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -2665,7 +2665,8 @@ try_replace_reg (rtx from, rtx to, rtx insn)
with our replacement. */
if (note != 0 && REG_NOTE_KIND (note) == REG_EQUAL)
set_unique_reg_note (insn, REG_EQUAL,
- simplify_replace_rtx (XEXP (note, 0), from, to));
+ simplify_replace_rtx (XEXP (note, 0), from,
+ copy_rtx (to)));
if (!success && set && reg_mentioned_p (from, SET_SRC (set)))
{
/* If above failed and this is a single set, try to simplify the source of
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d3bd10..cf4759f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-18 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/34132
+ * gcc.c-torture/compile/20071118-1.c: New test.
+
2007-11-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/31608
diff --git a/gcc/testsuite/gcc.c-torture/compile/20071118-1.c b/gcc/testsuite/gcc.c-torture/compile/20071118-1.c
new file mode 100644
index 0000000..d093d3f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20071118-1.c
@@ -0,0 +1,17 @@
+/* PR rtl-optimization/34132 */
+/* Testcase by Martin Michlmayr <tbm@cyrius.com> */
+
+static char *m = "%s%u.msg";
+extern void bar (int, const char *);
+void foo (short x, int y, int z)
+{
+ if (x == 0)
+ {
+ bar (y, m);
+ z = 1;
+ }
+ else if (x == 1)
+ z = 0;
+ bar (y, m);
+ bar (z, "%d");
+}