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.
This commit is contained in:
Nathan Sidwell 2020-07-28 05:49:35 -07:00
parent 6dcf042368
commit 134051f16b
1 changed files with 3 additions and 6 deletions

View File

@ -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.