tree-cfg.c (remove_forwarder_block): Fix the check to prevent a nonlocal label from...

	* tree-cfg.c (remove_forwarder_block): Fix the check to
	prevent a nonlocal label from appearing in the middle of a
	basic block.

From-SVN: r93917

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87dff43..9b7b9b5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * tree-cfg.c (remove_forwarder_block): Fix the check to
+       prevent a nonlocal label from appearing in the middle of a
+       basic block.
+
 2005-01-19  Hans-Peter Nilsson  <hp@axis.com>
 
        PR rtl-optimization/19462

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index d360719..ee5842c 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -3973,7 +3973,7 @@ remove_forwarder_block (basic_block bb, basic_block **worklist)
 
   /* If the destination block consists of an nonlocal label, do not merge
      it.  */
-  label = first_stmt (bb);
+  label = first_stmt (dest);
   if (label
       && TREE_CODE (label) == LABEL_EXPR
       && DECL_NONLOCAL (LABEL_EXPR_LABEL (label)))