* cpplex.c (_cpp_get_fresh_line): Revert my no-longer-needed

	08-28 change, since we're never called with a NULL buffer.
	(_cpp_lex_direct):  Likewise.
	* cpptrad.c (_cpp_read_logical_line_trad):  Likewise.
	Return false if buffer is NULL at end.

	* cpplex.c (_cpp_get_fresh_line):  Return value now just depends on
	whether pfile->buffer is NULL after pop, ignoring return_at_eof.


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

1 files changed, 4 insertions, 11 deletions

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index f779dfb7bc2..45cf5741b66 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -694,9 +694,6 @@ _cpp_get_fresh_line (cpp_reader *pfile)
     {
       cpp_buffer *buffer = pfile->buffer;
 
-      if (buffer == NULL)
-	return false;
-
       if (!buffer->need_line)
 	return true;
 
@@ -722,13 +719,9 @@ _cpp_get_fresh_line (cpp_reader *pfile)
 			       "no newline at end of file");
 	}
  
-      if (buffer->return_at_eof)
-	{
-	  _cpp_pop_buffer (pfile);
-	  return false;
-	}
-
       _cpp_pop_buffer (pfile);
+      if (pfile->buffer == NULL)
+	return false;
     }
 }
 
@@ -763,7 +756,7 @@ _cpp_lex_direct (cpp_reader *pfile)
  fresh_line:
   result->flags = 0;
   buffer = pfile->buffer;
-  if (buffer == NULL || buffer->need_line)
+  if (buffer->need_line)
     {
       if (!_cpp_get_fresh_line (pfile))
 	{
@@ -785,8 +778,8 @@ _cpp_lex_direct (cpp_reader *pfile)
       result->flags = BOL;
       if (pfile->state.parsing_args == 2)
 	result->flags |= PREV_WHITE;
-      buffer = pfile->buffer;
     }
+  buffer = pfile->buffer;
  update_tokens_line:
   result->line = pfile->line;