mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 16:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR preprocessor/88974 (ICE: Segmentation fault (in linemap_resolve_location))

Browse Source 
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
This commit is contained in:
Jakub Jelinek 2019-01-26 11:08:00 +01:00 committed by Jakub Jelinek
parent 2f6a6b28eb
commit 18f5df94df
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

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

6
gcc/testsuite/c-c++-common/cpp/pr88974.c Normal file
View File

@ -0,0 +1,6 @@
/* PR preprocessor/88974 */
/* { dg-do preprocess } */
#if __has_include (<pr88974.h)
/* { dg-error "missing terminating > character" "" { target *-*-* } .-1 } */
#endif

7
libcpp/ChangeLog
View File

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

2
libcpp/directives.c
View File

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

2
libcpp/expr.c
View File

@ -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__\"");

2
libcpp/internal.h
View File

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