aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamana Radhakrishnan <ramana.r@gmail.com>2007-05-06 14:08:55 +0000
committerKenneth Zadeck <zadeck@naturalbridge.com>2007-05-06 14:08:55 +0000
commit6af16d1c703b5b1c746e62d4af9153bc7711d659 (patch)
treee5428d3163d9626f25775ab747e9200d0ae3230c
parent1261c6a9ffb170db5139ab2e015af9a54edc3f25 (diff)
2007-05-05 Ramana Radhakrishnan <ramana.r@gmail.com>
Serge Belyshev <belyshev@depni.sinp.msu.ru> Kenneth Zadeck <zadeck@naturalbridge.com> * combine.c (recog_for_combine): Keep unused notes from being generated for scratch registers. * config/alpha/alpha.c: Add include for df.h. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/dataflow-branch@124474 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.dataflow9
-rw-r--r--gcc/combine.c8
-rw-r--r--gcc/config/alpha/alpha.c2
3 files changed, 16 insertions, 3 deletions
diff --git a/gcc/ChangeLog.dataflow b/gcc/ChangeLog.dataflow
index 0113d6a698d..0223a1a6bb9 100644
--- a/gcc/ChangeLog.dataflow
+++ b/gcc/ChangeLog.dataflow
@@ -1,3 +1,12 @@
+2007-05-05 Ramana Radhakrishnan <ramana.r@gmail.com>
+ Serge Belyshev <belyshev@depni.sinp.msu.ru>
+ Kenneth Zadeck <zadeck@naturalbridge.com>
+
+ * combine.c (recog_for_combine): Keep unused notes from being
+ generated for scratch registers.
+ * config/alpha/alpha.c: Add include for df.h.
+
+
2007-05-01 Kenneth Zadeck <zadeck@naturalbridge.com>
Do not delete regnotes when recreating them.
diff --git a/gcc/combine.c b/gcc/combine.c
index 00cd1ee3a38..85f63cc2f82 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -9746,8 +9746,12 @@ recog_for_combine (rtx *pnewpat, rtx insn, rtx *pnotes)
if (REG_P (XEXP (XVECEXP (newpat, 0, i), 0))
&& ! reg_dead_at_p (XEXP (XVECEXP (newpat, 0, i), 0), insn))
return -1;
- notes = gen_rtx_EXPR_LIST (REG_UNUSED,
- XEXP (XVECEXP (newpat, 0, i), 0), notes);
+ if (GET_CODE (XEXP (XVECEXP (newpat, 0, i), 0)) != SCRATCH)
+ {
+ gcc_assert (REG_P (XEXP (XVECEXP (newpat, 0, i), 0)));
+ notes = gen_rtx_EXPR_LIST (REG_UNUSED,
+ XEXP (XVECEXP (newpat, 0, i), 0), notes);
+ }
}
pat = newpat;
}
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 79c0a34f509..dbbea7b1d20 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -56,7 +56,7 @@ Boston, MA 02110-1301, USA. */
#include "tree-flow.h"
#include "tree-stdarg.h"
#include "tm-constrs.h"
-
+#include "df.h"
/* Specify which cpu to schedule for. */
enum processor_type alpha_tune;