* loop.c (emit_prefetch_instructions): Properly place the address computation.

	* basic-block.h (basic_block_for_insn, BLOCK_FOR_INSN): Kill.
	(set_block_for_insn): Turn into macro.
	* cfgbuild.c (find_basic_block): Do not clear basic_block_for_insn.
	* cfglayout.c (insn_scopes): Kill.
	(scope_to_insns_initialize): Do not use insn_scopes.
	(scope_to_insns_finalize): Likewise.
	(duplicate_insn_chain): Likewise.
	(cfg_layout_initialize, cfg_layout_finalize): Do not turn scopes to notes.
	* cfgrtl.c (basic_block_for_insn): Kill.
	(delete_insn_and_edges, delete_insn_chain_and_edges): Simplify.
	(create_basic_block_structure): Use reorder_insns.
	(compute_bb_for_insn): Do not use basic_block_for_insn.
	(merge_blocks_nomove): Likewise.
	(update_bb_for_insn): Likewise.
	(verify_flow_info): Likewise.
	(set_block_for_insn): Kill.
	* combine.c (try_combine): Update gen_rtx_INSN call.
	* emit-rtl.c (gen_label_rtx): Update gen_rtx_CODE_LABEL call.
	(mark_insn_raw, make_jump_insn_raw, make_call_insn_raw): Clear
	scopes and BBs.
	(add_insn_after, add_insn_before, remove_insn, reorder_insns): Simplify.
	(emit_note_before, emit_note_after, emit_line_note_after, emit_note):
	Clear BB.
	(emit_insns_after): Simplify.
	(emit_copy_of_insn_after): Copy scope.
	* final.c (final_start_function): Lower scopes.
	* flow.c (check_function_return_warnings): Do not rely on deleted insn.
	* integrate.c (copy_insn_list): Cope scopes.
	* jump.c (duplicate_loop_exit_test): LIkewise; simplify.
	* loop.c (loop_optimize): Do not care block notes.
	* print-rtl.c (print_rtx): Print BB.
	* recog.c (apply_change_group): Simplify.
	* rtl.c (copy_rtx): Handle 'B'.
	* rtl.def (INSN, CALL_INSN, JUMP_INSN, NOTE): Add extra fields.
	* rtl.h (Field accessors): Update indexes.
	* sched-ebb.c (schedule_ebbs): Do not lower notes.
	* sched-rgn.c (schedule_insns): Likewise.
	* toplev.c (rest_of_compilation): Lower notes.
	* unroll.c (unroll_loop): Do not care scoping notes.
	(copy_loop_body): Copy scopes.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54188 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 10 deletions

diff --git a/gcc/loop.c b/gcc/loop.c
index 20c5f1dab0a..bc75f8ba3b8 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -566,13 +566,6 @@ loop_optimize (f, dumpfile, flags)
 	scan_loop (loop, flags);
     }
 
-  /* If there were lexical blocks inside the loop, they have been
-     replicated.  We will now have more than one NOTE_INSN_BLOCK_BEG
-     and NOTE_INSN_BLOCK_END for each such block.  We must duplicate
-     the BLOCKs as well.  */
-  if (write_symbols != NO_DEBUG)
-    reorder_blocks ();
-
   end_alias_analysis ();
 
   /* Clean up.  */
@@ -4139,6 +4132,7 @@ emit_prefetch_instructions (loop)
 	  int bytes_ahead = PREFETCH_BLOCK * (ahead + y);
 	  rtx before_insn = info[i].giv->insn;
 	  rtx prev_insn = PREV_INSN (info[i].giv->insn);
+	  rtx seq;
 
 	  /* We can save some effort by offsetting the address on
 	     architectures with offsettable memory references.  */
@@ -4153,13 +4147,16 @@ emit_prefetch_instructions (loop)
 	      loc = reg;
 	    }
 
+	  start_sequence ();
 	  /* Make sure the address operand is valid for prefetch.  */
 	  if (! (*insn_data[(int)CODE_FOR_prefetch].operand[0].predicate)
 		  (loc, insn_data[(int)CODE_FOR_prefetch].operand[0].mode))
 	    loc = force_reg (Pmode, loc);
-	  emit_insn_before (gen_prefetch (loc, GEN_INT (info[i].write),
-					  GEN_INT (3)),
-			    before_insn);
+	  emit_insn (gen_prefetch (loc, GEN_INT (info[i].write),
+				   GEN_INT (3)));
+	  seq = gen_sequence ();
+	  end_sequence ();
+	  emit_insn_before (seq, before_insn);
 
 	  /* Check all insns emitted and record the new GIV
 	     information.  */