From: Jan Hubicka Date: Sat, 4 Sep 2004 10:12:42 +0000 (+0200) Subject: passes.c (rest_of_clean_state): Fix merge conflict made during commiting the patch. X-Git-Tag: releases/gcc-4.0.0~5227 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d168c2457d819a6c89c0b198fb2c0e093754504;p=thirdparty%2Fgcc.git 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 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 856eff4cb9d3..c6c645e064be 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 a125c71b7017..d55e9b910621 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