re PR middle-end/18903 (ice in bsi_after_labels)

2004-12-10  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/18903
        * gcc.c-torture/compile/pr18903.c: New test.

2004-12-10  Andrew Pinski  <pinskia@physics.uc.edu>

        PR middle-end/18903
        * tree-cfg.c (remove_bb): Put the moved label at the beginning
        of the basic block.

From-SVN: r92006

gcc/ChangeLog

+2004-12-10  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR middle-end/18903
+	* tree-cfg.c (remove_bb): Put the moved label at the beginning
+	of the basic block.
+
 2004-12-10  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-data-ref.c (free_data_refs): Free each data_reference

gcc/testsuite/ChangeLog

+2004-12-10  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR middle-end/18903
+	* gcc.c-torture/compile/pr18903.c: New test.
+
 2004-12-10  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gcc.c-torture/execute/20041210-1.c: New test.

gcc/testsuite/gcc.c-torture/compile/pr18903.c

+/* We were ICEing in bsi_after_labels because 
+   we had a BB which did not have a lablel.
+   PR middle-end/18903 */
+
+#ifndef NO_LABEL_VALUES
+void g (int s, int f)
+{
+  &&ff;
+  s = f;
+  ff:
+  goto end;
+  f = s;
+  end:;
+}
+#else
+int g;
+#endif

gcc/tree-cfg.c

@@ -2003,10 +2003,10 @@ remove_bb (basic_block bb)
           && FORCED_LABEL (LABEL_EXPR_LABEL (stmt)))
 	{
 	  basic_block new_bb = bb->prev_bb;
-	  block_stmt_iterator new_bsi = bsi_after_labels (new_bb);
+	  block_stmt_iterator new_bsi = bsi_start (new_bb);
 	  	  
 	  bsi_remove (&i);
-	  bsi_insert_after (&new_bsi, stmt, BSI_NEW_STMT);
+	  bsi_insert_before (&new_bsi, stmt, BSI_NEW_STMT);
 	}
       else
         {