sh.c (barrier_align): Don't ask for alignment when seeing a branch-around-a-jump from...

* sh.c (barrier_align): Don't ask for alignment when seeing a
	branch-around-a-jump from machine_dependent_reorg.

From-SVN: r43474
This commit is contained in:
J"orn Rennecke 2001-06-20 16:04:31 +00:00 committed by Joern Rennecke
parent 5e93ca8698
commit 5d29121331
2 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Wed Jun 20 17:02:50 2001 J"orn Rennecke <amylaar@redhat.com>
* sh.c (barrier_align): Don't ask for alignment when seeing a
branch-around-a-jump from machine_dependent_reorg.
Wed Jun 20 08:35:02 2001 Jeffrey A Law (law@cygnus.com)
* ssa.c (rename_block): Update parameter to remove_phi_alternative

View File

@ -2941,7 +2941,15 @@ barrier_align (barrier_or_label)
/* If relax_delay_slots() decides NEXT was redundant
with some previous instruction, it will have
redirected PREV's jump to the following insn. */
|| JUMP_LABEL (prev) == next_nonnote_insn (next)))
|| JUMP_LABEL (prev) == next_nonnote_insn (next)
/* There is no upper bound on redundant instructions that
might have been skipped, but we must not put an alignment
where none had been before. */
|| (NEXT_INSN (PREV_INSN (prev)) != prev
&& ((INSN_CODE (NEXT_INSN (NEXT_INSN (prev)))
== CODE_FOR_block_branch_redirect)
|| (INSN_CODE (NEXT_INSN (NEXT_INSN (prev)))
== CODE_FOR_indirect_jump_scratch)))))
{
rtx pat = PATTERN (prev);
if (GET_CODE (pat) == PARALLEL)