aboutsummaryrefslogtreecommitdiff
path: root/gcc/reorg.c
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@bitrange.com>2001-09-14 22:25:05 +0000
committerHans-Peter Nilsson <hp@bitrange.com>2001-09-14 22:25:05 +0000
commitd5c33eed727c7c2540c69a2d6408b17c28a24ab9 (patch)
treea38a526192ef4bd20c83cc52bb79db9098211b99 /gcc/reorg.c
parent7d56a999e6ffd9326d0bc35ba10cfc8ce3c37fb2 (diff)
* reorg.c (fill_slots_from_thread): After call to
steal_delay_list_from_target, update own_thread as new_thread may have branched. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@45616 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/reorg.c')
-rw-r--r--gcc/reorg.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 5cff4b36b73..20399450ae9 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2800,12 +2800,18 @@ fill_slots_from_thread (insn, condition, thread, opposite_thread, likely,
/* If this is the `true' thread, we will want to follow the jump,
so we can only do this if we have taken everything up to here. */
if (thread_if_true && trial == new_thread)
- delay_list
- = steal_delay_list_from_target (insn, condition, PATTERN (trial),
- delay_list, &set, &needed,
- &opposite_needed, slots_to_fill,
- pslots_filled, &must_annul,
- &new_thread);
+ {
+ delay_list
+ = steal_delay_list_from_target (insn, condition, PATTERN (trial),
+ delay_list, &set, &needed,
+ &opposite_needed, slots_to_fill,
+ pslots_filled, &must_annul,
+ &new_thread);
+ /* If we owned the thread and are told that it branched
+ elsewhere, make sure we own the thread at the new location. */
+ if (own_thread && trial != new_thread)
+ own_thread = own_thread_p (new_thread, new_thread, 0);
+ }
else if (! thread_if_true)
delay_list
= steal_delay_list_from_fallthrough (insn, condition,