bb-reorder.c (remove_scope_notes): Check for both types of scope notes as the…

bb-reorder.c (remove_scope_notes): Check for both types of scope notes as the end of a basic block before deleting.

Tue May  2 17:06:53 2000  Jason Eckhardt  <jle@cygnus.com>

	* bb-reorder.c (remove_scope_notes): Check for both types of scope
	notes as the end of a basic block before deleting.

From-SVN: r33619

gcc/ChangeLog

+Tue May  2 17:06:53 2000  Jason Eckhardt  <jle@cygnus.com>
+
+	* bb-reorder.c (remove_scope_notes): Check for both types of scope
+	notes as the end of a basic block before deleting.
+
 2000-05-02  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* final.c (final_start_function): Fix spelling of "necessary".

gcc/bb-reorder.c

@@ -1146,10 +1146,11 @@ remove_scope_notes ()
 	  && (NOTE_LINE_NUMBER (x) == NOTE_INSN_BLOCK_BEG
 	      || NOTE_LINE_NUMBER (x) == NOTE_INSN_BLOCK_END))
 	{
-	  /* Check if the scope end happens to be the end of a bb.  */
-	  if (currbb && x == currbb->end
-	      && NOTE_LINE_NUMBER (x) == NOTE_INSN_BLOCK_END)
+	  /* Check if the scope note happens to be the end of a bb.  */
+	  if (currbb && x == currbb->end)
 	    currbb->end = PREV_INSN (x);
+	  if (currbb && x == currbb->head)
+	    abort ();
 
 	  if (PREV_INSN (x))
 	    {