aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/passes.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 856eff4..c6c645e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2004-09-04 Jan Hubicka <jh@suse.cz>
+ * passes.c (rest_of_clean_state): Fix merge conflict made during
+ commiting the patch.
+
+2004-09-04 Jan Hubicka <jh@suse.cz>
+
* passes.c (rest_of_clean_state): Decompose the instruction stream.
2004-09-04 Richard Sandiford <rsandifo@redhat.com>
diff --git a/gcc/passes.c b/gcc/passes.c
index a125c71..d55e9b9 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1633,8 +1633,8 @@ rest_of_handle_shorten_branches (void)
static void
rest_of_clean_state (void)
{
- coverage_end_function ();
rtx insn, next;
+ coverage_end_function ();
/* It is very important to decompose the RTL instruction chain here:
debug information keeps pointing into CODE_LABEL insns inside the function