dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die rather than asserting it.

	* dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die
	rather than asserting it.

From-SVN: r25448

gcc/ChangeLog

+Thu Feb 25 21:23:06 1999  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die
+	rather than asserting it.
+
 Thu Feb 25 23:33:06 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* cppexp.c (left_shift, right_shift, parse_charconst, COMPARE,
@@ -333,7 +338,6 @@ Fri Feb 19 18:18:56 1999  Don Bowman  <don@pixstream.com>
 	* configure.in (mips*-*-vxworks*): Enable gthreads vxworks support.
 	* configure: Rebuilt.
 
->>>>>>> 1.3049
 Sun Feb 21 20:34:44 PST 1999 Jeff Law  (law@cygnus.com)
 
 	* version.c: Bump for snapshot.

gcc/dwarf2out.c

@@ -7682,12 +7682,14 @@ scope_die_for (t, context_die)
 
       if (i < 0)
 	{
-	  if (scope_die != comp_unit_die
-	      || TREE_CODE_CLASS (TREE_CODE (containing_scope)) != 't')
+	  if (TREE_CODE_CLASS (TREE_CODE (containing_scope)) != 't')
 	    abort ();
 	  if (debug_info_level > DINFO_LEVEL_TERSE
 	      && !TREE_ASM_WRITTEN (containing_scope))
 	    abort ();
+
+	  /* If none of the current dies are suitable, we get file scope.  */
+	  scope_die = comp_unit_die;
 	}
     }