From 8416f80a8ac3dfbca3f9ecc36dfdb6f3b189d6f4 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 11 Aug 2000 00:39:55 -0700 Subject: [PATCH] flow.c (merge_blocks_nomove): Be more careful about locating the beginning of block A. * flow.c (merge_blocks_nomove): Be more careful about locating the beginning of block A. From-SVN: r35623 --- gcc/ChangeLog | 3 +++ gcc/flow.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0a72584d802..7c59c1083ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2000-08-11 Richard Henderson + * flow.c (merge_blocks_nomove): Be more careful about + locating the beginning of block A. + * combine.c (simplify_shift_const): Obey SHIFT_COUNT_TRUNCATED. Thu Aug 10 22:47:09 2000 Ovidiu Predescu diff --git a/gcc/flow.c b/gcc/flow.c index 483592f5278..8a901c896b2 100644 --- a/gcc/flow.c +++ b/gcc/flow.c @@ -2211,9 +2211,9 @@ merge_blocks_nomove (a, b) { rtx prev; - prev = prev_nonnote_insn (a_end); - if (!prev) - prev = a->head; + for (prev = PREV_INSN (a_end); ; prev = PREV_INSN (prev)) + if (GET_CODE (prev) != NOTE || prev == a->head) + break; del_first = a_end; -- 2.30.2