diff options
| author | Jan Hubicka <jh@suse.cz> | 2004-09-04 12:12:42 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2004-09-04 10:12:42 +0000 |
| commit | 8d168c2457d819a6c89c0b198fb2c0e093754504 (patch) | |
| tree | b20a90ddbf4fa673187739a48e9774ff99ae18c8 | |
| parent | 0a9aeefd620bb680d58187a52532c8c027ee991d (diff) | |
| download | gcc-8d168c2457d819a6c89c0b198fb2c0e093754504.zip gcc-8d168c2457d819a6c89c0b198fb2c0e093754504.tar.gz gcc-8d168c2457d819a6c89c0b198fb2c0e093754504.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/passes.c | 2 |
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 |