diff options
author | Lewis Hyatt <lhyatt@gmail.com> | 2023-12-20 16:27:42 -0500 |
---|---|---|
committer | Lewis Hyatt <lhyatt@gmail.com> | 2024-03-14 07:33:02 -0400 |
commit | 6c166e55b15894ceb07dcc7b55f900e50e24ec5b (patch) | |
tree | baad9623de6445515e183e7d243b2436295037f7 /ar-lib | |
parent | b7f70cfdb6f7ab369ecca14a99a0064d2a11ddd2 (diff) | |
download | gcc-6c166e55b15894ceb07dcc7b55f900e50e24ec5b.zip gcc-6c166e55b15894ceb07dcc7b55f900e50e24ec5b.tar.gz gcc-6c166e55b15894ceb07dcc7b55f900e50e24ec5b.tar.bz2 |
libcpp: Fix __has_include_next ICE in the last directory of the path [PR80755]
In libcpp/files.cc, the function _cpp_has_header(), which implements
__has_include and __has_include_next, does not check for a NULL return value
from search_path_head(), leading to an ICE tripping an assert when
_cpp_find_file() tries to use it. Fix it by checking for that case and
silently returning false instead.
As suggested by the PR author, it is easiest to make a testcase by using
the -idirafter option. To enable that, also modify the dg-additional-options
testsuite procedure to make the global $srcdir available, since -idirafter
requires the full path.
libcpp/ChangeLog:
PR preprocessor/80755
* files.cc (search_path_head): Add SUPPRESS_DIAGNOSTIC argument
defaulting to false.
(_cpp_has_header): Silently return false if the search path has been
exhausted, rather than issuing a diagnostic and then hitting an
assert.
gcc/testsuite/ChangeLog:
* lib/gcc-defs.exp (dg-additional-options): Make $srcdir usable in a
dg-additional-options directive.
* c-c++-common/cpp/has-include-next-2-dir/has-include-next-2.h: New test.
* c-c++-common/cpp/has-include-next-2.c: New test.
Diffstat (limited to 'ar-lib')
0 files changed, 0 insertions, 0 deletions