diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-29 20:25:27 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-29 20:25:27 +0000 |
| commit | 18afbc83084423f3b190b8c6844e6fe42c509ce7 (patch) | |
| tree | 694aa89b38234a2bb9ee479d1fa7c3bde396a87e /gcc/c-family/c-ppoutput.c | |
| parent | 922875bc0966b8b2da696e8d44a314bbc8374400 (diff) | |
| download | gcc-18afbc83084423f3b190b8c6844e6fe42c509ce7.tar.gz | |
PR preprocessor/48248
* c-ppoutput.c (print): Add src_file field.
(init_pp_output): Initialize it.
(maybe_print_line): Don't optimize by adding up to 8 newlines
if map->to_file and print.src_file are different file.
(print_line): Update print.src_file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171693 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-ppoutput.c')
| -rw-r--r-- | gcc/c-family/c-ppoutput.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c index 57ed676baac..9ebac423164 100644 --- a/gcc/c-family/c-ppoutput.c +++ b/gcc/c-family/c-ppoutput.c @@ -36,6 +36,7 @@ static struct int src_line; /* Line number currently being written. */ unsigned char printed; /* Nonzero if something output at line. */ bool first_time; /* pp_file_change hasn't been called yet. */ + const char *src_file; /* Current source file. */ } print; /* Defined and undefined macros being queued for output with -dU at @@ -153,6 +154,7 @@ init_pp_output (FILE *out_stream) print.prev = 0; print.outf = out_stream; print.first_time = 1; + print.src_file = ""; } /* Writes out the preprocessed file, handling spacing and paste @@ -312,7 +314,9 @@ maybe_print_line (source_location src_loc) print.printed = 0; } - if (src_line >= print.src_line && src_line < print.src_line + 8) + if (src_line >= print.src_line + && src_line < print.src_line + 8 + && strcmp (map->to_file, print.src_file) == 0) { while (src_line > print.src_line) { @@ -344,6 +348,7 @@ print_line (source_location src_loc, const char *special_flags) unsigned char *p; print.src_line = SOURCE_LINE (map, src_loc); + print.src_file = map->to_file; /* cpp_quote_string does not nul-terminate, so we have to do it ourselves. */ |