From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 28 Jul 2020 12:49:35 +0000 (-0700)
Subject: preprocessor: Simplify read_main
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=134051f16bd490ada9febb7511a202b34b1821f3;p=gcc.git

preprocessor: Simplify read_main

We can always use the final map to get the return value, rather than
conditionally only when there was an immediate line directive.

	libcpp/
	* init.c (cpp_read_main_file): Always use the last map for
	the return value.
---

diff --git a/libcpp/init.c b/libcpp/init.c
index 0aac5acd0a3..f9f1fb204f0 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -683,12 +683,9 @@ cpp_read_main_file (cpp_reader *pfile, const char *fname, bool injecting)
   /* For foo.i, read the original filename foo.c now, for the benefit
      of the front ends.  */
   if (CPP_OPTION (pfile, preprocessed))
-    {
-      read_original_filename (pfile);
-      fname = (ORDINARY_MAP_FILE_NAME
-	       ((LINEMAPS_LAST_ORDINARY_MAP (pfile->line_table))));
-    }
-  return fname;
+    read_original_filename (pfile);
+
+  return ORDINARY_MAP_FILE_NAME (LINEMAPS_LAST_ORDINARY_MAP (pfile->line_table));
 }
 
 /* For preprocessed files, if the first tokens are of the form # NUM.