diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-01-26 11:08:00 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-01-26 11:08:00 +0100 |
| commit | 18f5df94df9a8abcbf9410c79c180de6f7b85f51 (patch) | |
| tree | 9c09a82425d5c1d2c2859f73f4ca6281c4a446b8 | |
| parent | 2f6a6b28ebec12d88256c90a34288f33cbfd607e (diff) | |
| download | gcc-18f5df94df9a8abcbf9410c79c180de6f7b85f51.zip gcc-18f5df94df9a8abcbf9410c79c180de6f7b85f51.tar.gz gcc-18f5df94df9a8abcbf9410c79c180de6f7b85f51.tar.bz2 | |
re PR preprocessor/88974 (ICE: Segmentation fault (in linemap_resolve_location))
PR preprocessor/88974
* directives.c (SEEN_EOL): Move macro to ...
* internal.h (SEEN_EOL): ... here.
* expr.c (parse_has_include): Don't cpp_get_token if SEEN_EOL ().
* c-c++-common/cpp/pr88974.c: New test.
From-SVN: r268285
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/pr88974.c | 6 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/directives.c | 2 | ||||
| -rw-r--r-- | libcpp/expr.c | 2 | ||||
| -rw-r--r-- | libcpp/internal.h | 2 |
6 files changed, 21 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 84e195c..a1805f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-26 Jakub Jelinek <jakub@redhat.com> + + PR preprocessor/88974 + * c-c++-common/cpp/pr88974.c: New test. + 2019-01-25 Paolo Carlini <paolo.carlini@oracle.com> PR c++/88969 diff --git a/gcc/testsuite/c-c++-common/cpp/pr88974.c b/gcc/testsuite/c-c++-common/cpp/pr88974.c new file mode 100644 index 0000000..c375d83 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/pr88974.c @@ -0,0 +1,6 @@ +/* PR preprocessor/88974 */ +/* { dg-do preprocess } */ + +#if __has_include (<pr88974.h) +/* { dg-error "missing terminating > character" "" { target *-*-* } .-1 } */ +#endif diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index eec6a57..ae05d6b 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2019-01-26 Jakub Jelinek <jakub@redhat.com> + + PR preprocessor/88974 + * directives.c (SEEN_EOL): Move macro to ... + * internal.h (SEEN_EOL): ... here. + * expr.c (parse_has_include): Don't cpp_get_token if SEEN_EOL (). + 2019-01-01 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/libcpp/directives.c b/libcpp/directives.c index 1a35c07..1ada834 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -204,8 +204,6 @@ static const directive linemarker_dir = do_linemarker, UC"#", 1, KANDR, IN_I }; -#define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF) - /* Skip any remaining tokens in a directive. */ static void skip_rest_of_line (cpp_reader *pfile) diff --git a/libcpp/expr.c b/libcpp/expr.c index 6ab5493..d8438a5 100644 --- a/libcpp/expr.c +++ b/libcpp/expr.c @@ -2238,7 +2238,7 @@ parse_has_include (cpp_reader *pfile, enum include_type type) XDELETEVEC (fname); } - if (paren && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN) + if (paren && !SEEN_EOL () && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN) cpp_error (pfile, CPP_DL_ERROR, "missing ')' after \"__has_include__\""); diff --git a/libcpp/internal.h b/libcpp/internal.h index 0bd7df9..77a2a3b 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -593,6 +593,8 @@ struct cpp_reader #define is_nvspace(x) IS_NVSPACE(x) #define is_space(x) IS_SPACE_OR_NUL(x) +#define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF) + /* This table is constant if it can be initialized at compile time, which is the case if cpp was compiled with GCC >=2.7, or another compiler that supports C99. */ |