diff options
| author | Per Bothner <pbothner@apple.com> | 2003-10-02 07:03:42 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-10-02 00:03:42 -0700 |
| commit | f4b2bde73f84ff3936cba8c8a3773c4c29a038fe (patch) | |
| tree | 073d54a44fc0257e933d04f1fd0ec4b6ab34ab6e | |
| parent | efef2a5f2a6d41108e7df6f5d5e881d3073feae6 (diff) | |
| download | gcc-f4b2bde73f84ff3936cba8c8a3773c4c29a038fe.zip gcc-f4b2bde73f84ff3936cba8c8a3773c4c29a038fe.tar.gz gcc-f4b2bde73f84ff3936cba8c8a3773c4c29a038fe.tar.bz2 | |
c-lex.c (fe_file_change): Handle a NULL new_map.
* c-lex.c (fe_file_change): Handle a NULL new_map.
* fix-header.c (cb_file_change): Likewise.
* c-ppoutput.c (pp_file_change): Likewise.
From-SVN: r72011
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-lex.c | 6 | ||||
| -rw-r--r-- | gcc/c-ppoutput.c | 37 | ||||
| -rw-r--r-- | gcc/fix-header.c | 2 |
4 files changed, 31 insertions, 18 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3bad417..2cd52af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -5,6 +5,10 @@ (get_non_padding_token): We no longer need to compensate for the "horrible things" the C++ front-end does with the current line number, + * c-lex.c (fe_file_change): Handle a NULL new_map. + * fix-header.c (cb_file_change): Likewise. + * c-ppoutput.c (pp_file_change): Likewise. + 2003-10-01 Zack Weinberg <zack@codesourcery.com> * target.h (init_libfuncs): New hook. diff --git a/gcc/c-lex.c b/gcc/c-lex.c index f3cdd3c..5546fc9 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -212,6 +212,12 @@ cb_dir_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const char *dir) void fe_file_change (const struct line_map *new_map) { + if (new_map == NULL) + { + map = NULL; + return; + } + if (new_map->reason == LC_ENTER) { /* Don't stack the main buffer on the input stack; diff --git a/gcc/c-ppoutput.c b/gcc/c-ppoutput.c index 669d11e..22e595f 100644 --- a/gcc/c-ppoutput.c +++ b/gcc/c-ppoutput.c @@ -346,24 +346,27 @@ pp_file_change (const struct line_map *map) if (flag_no_line_commands || flag_no_output) return; - /* First time? */ - if (print.map == NULL) + if (map != NULL) { - /* Avoid printing foo.i when the main file is foo.c. */ - if (!cpp_get_options (parse_in)->preprocessed) - print_line (map, map->from_line, flags); - } - else - { - /* Bring current file to correct line when entering a new file. */ - if (map->reason == LC_ENTER) - maybe_print_line (map - 1, map->from_line - 1); - - if (map->reason == LC_ENTER) - flags = " 1"; - else if (map->reason == LC_LEAVE) - flags = " 2"; - print_line (map, map->from_line, flags); + /* First time? */ + if (print.map == NULL) + { + /* Avoid printing foo.i when the main file is foo.c. */ + if (!cpp_get_options (parse_in)->preprocessed) + print_line (map, map->from_line, flags); + } + else + { + /* Bring current file to correct line when entering a new file. */ + if (map->reason == LC_ENTER) + maybe_print_line (map - 1, map->from_line - 1); + + if (map->reason == LC_ENTER) + flags = " 1"; + else if (map->reason == LC_LEAVE) + flags = " 2"; + print_line (map, map->from_line, flags); + } } print.map = map; diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 0f5f8c0..8ae3025 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -578,7 +578,7 @@ cb_file_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const struct line_map *map) { /* Just keep track of current file name. */ - cur_file = map->to_file; + cur_file = map == NULL ? NULL : map->to_file; } static void |