diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 317122a646b..8cb61376b02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 27 22:54:14 CET 2002  Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz>
+
+	* cfgrtl.c (merge_blocks_nomove): Use set_block_for_insn instead of
+	assigning to BLOCK_FOR_INSN directly.
+
 Wed Mar 27 22:33:05 CET 2002  Jan Hubicka  <jh@suse.cz>
 
 	* i386.c (ix86_output_addr_diff_elt): Remove binutils bug workaround.
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index a4f7006d392..ef9a91c96b9 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -661,9 +661,9 @@ merge_blocks_nomove (a, b)
 	  rtx x;
 
 	  for (x = a_end; x != b_end; x = NEXT_INSN (x))
-	    BLOCK_FOR_INSN (x) = a;
+	    set_block_for_insn (x, a);
 
-	  BLOCK_FOR_INSN (b_end) = a;
+	  set_block_for_insn (b_end, a);
 	}
 
       a_end = b_end;