From 8d168c2457d819a6c89c0b198fb2c0e093754504 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 4 Sep 2004 12:12:42 +0200 Subject: [PATCH] passes.c (rest_of_clean_state): Fix merge conflict made during commiting the patch. * passes.c (rest_of_clean_state): Fix merge conflict made during commiting the patch. From-SVN: r87081 --- gcc/ChangeLog | 5 +++++ gcc/passes.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 856eff4cb9d..c6c645e064b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-09-04 Jan Hubicka + + * passes.c (rest_of_clean_state): Fix merge conflict made during + commiting the patch. + 2004-09-04 Jan Hubicka * passes.c (rest_of_clean_state): Decompose the instruction stream. diff --git a/gcc/passes.c b/gcc/passes.c index a125c71b701..d55e9b91062 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 -- 2.30.2