cfgexpand.c (expand_gimple_cond): Convert also goto_block and goto_locus of…

cfgexpand.c (expand_gimple_cond): Convert also goto_block and goto_locus of true_edge into RTL locator.

	* cfgexpand.c (expand_gimple_cond): Convert also goto_block and
	goto_locus of true_edge into RTL locator.

From-SVN: r140986

gcc/ChangeLog

+2008-10-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* cfgexpand.c (expand_gimple_cond): Convert also goto_block and
+	goto_locus of true_edge into RTL locator.
+
 2008-10-08  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*jcc_btdi_rex64): Clobber FLAGS_REG.

gcc/cfgexpand.c

@@ -1725,6 +1725,14 @@ expand_gimple_cond (basic_block bb, gimple stmt)
 
   maybe_dump_rtl_for_gimple_stmt (stmt, last2);
 
+  if (true_edge->goto_locus)
+    {
+      set_curr_insn_source_location (true_edge->goto_locus);
+      set_curr_insn_block (true_edge->goto_block);
+      true_edge->goto_locus = curr_insn_locator ();
+    }
+  true_edge->goto_block = NULL;
+
   ggc_free (pred);
   return new_bb;
 }