diff options
| author | Nathan Sidwell <nathan@acm.org> | 2019-09-06 12:54:19 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2019-09-06 12:54:19 +0000 |
| commit | 400b8274e6992c348a822a99ef0c38290aede386 (patch) | |
| tree | 15ee707e72667a7bc08d9754ef8502189f2cdc9a | |
| parent | aff342a3c1808044323044506e0d034b55310bf1 (diff) | |
[preprocessor] Popping "" file names
https://gcc.gnu.org/ml/gcc-patches/2019-08/msg02069.html
New # semantics for popping to "" name.
libcpp/
* directives.c (do_linemarker): Popping to "" name means get the
name from the include stack..
From-SVN: r275457
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/line-1.c | 20 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/directives.c | 15 |
4 files changed, 43 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9a544bc27a6..b999a79a466 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-09-06 Nathan Sidwell <nathan@acm.org> + + * c-c++-common/cpp/line-1.c: New. + 2019-09-06 Martin Liska <mliska@suse.cz> PR c++/91125 diff --git a/gcc/testsuite/c-c++-common/cpp/line-1.c b/gcc/testsuite/c-c++-common/cpp/line-1.c new file mode 100644 index 00000000000..8e9c94130a1 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/line-1.c @@ -0,0 +1,20 @@ +/* { dg-do preprocess } */ +/* { dg-additional-options -Wno-pedantic } */ + +main-1 __FILE__ + +# 7 "inner.h" 1 +inner-1 __FILE__ +# 9 "inside.h" 1 +inside-1 __FILE__ +# 11 "" 2 +inner-2 __FILE__ +#13 "" 2 +main-2 __FILE__ + + +/* { dg-final { scan-file line-1.i "main-1 \"\[^\n]*line-1.c\"\n" } } */ +/* { dg-final { scan-file line-1.i "main-2 \"\[^\n]*line-1.c\"\n" } } */ +/* { dg-final { scan-file line-1.i "inner-1 \"inner.h\"\n" } } */ +/* { dg-final { scan-file line-1.i "inner-2 \"inner.h\"\n" } } */ +/* { dg-final { scan-file line-1.i "inside-1 \"inside.h\"\n" } } */ diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index c418d75c950..1ec8541a54c 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2019-08-30 Nathan Sidwell <nathan@acm.org> + + New # semantics for popping to "" name. + libcpp/ + * directives.c (do_linemarker): Popping to "" name means get the + name from the include stack.. + 2019-09-05 Nathan Sidwell <nathan@acm.org> PR preprocessor/91639 diff --git a/libcpp/directives.c b/libcpp/directives.c index 1c6b31e143b..61f1fef9489 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -1088,9 +1088,17 @@ do_linemarker (cpp_reader *pfile) map = LINEMAPS_LAST_ORDINARY_MAP (line_table); const line_map_ordinary *from = linemap_included_from_linemap (line_table, map); - if (MAIN_FILE_P (map) - || (from - && filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0)) + + if (!from) + /* Not nested. */; + else if (!new_file[0]) + /* Leaving to "" means fill in the popped-to name. */ + new_file = ORDINARY_MAP_FILE_NAME (from); + else if (filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0) + /* It's the wrong name, Grommit! */ + from = NULL; + + if (!from) { cpp_warning (pfile, CPP_W_NONE, "file \"%s\" linemarker ignored due to " @@ -1098,6 +1106,7 @@ do_linemarker (cpp_reader *pfile) return; } } + /* Compensate for the increment in linemap_add that occurs in _cpp_do_file_change. We're currently at the start of the line *following* the #line directive. A separate location_t for this |