Various cleanups to help compile server.

	* line-map.c (add_line_map):  Allow leaving the outermost file.
	Allowing entering an outermost-file after the initial time.

	* toplev.c (pop_srcloc):  Allow popping from initial file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64616 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 5 deletions

diff --git a/gcc/toplev.c b/gcc/toplev.c
index e1b97a104ff..eadcb36958f 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2166,11 +2166,17 @@ pop_srcloc ()
   input_file_stack = fs->next;
   free (fs);
   input_file_stack_tick++;
-  /* The initial source file is never popped.  */
-  if (!input_file_stack)
-    abort ();
-  input_filename = input_file_stack->name;
-  lineno = input_file_stack->line;
+
+  if (input_file_stack)
+    {
+      input_filename = input_file_stack->name;
+      lineno = input_file_stack->line;
+    }
+  else
+    {
+      input_filename = NULL;
+      lineno = 0;
+    }
 }
 
 /* Compile an entire translation unit.  Write a file of assembly