]> gcc.gnu.org Git - gcc.git/commit
libcpp: Fix __has_include_next ICE in the last directory of the path [PR80755]
authorLewis Hyatt <lhyatt@gmail.com>
Wed, 20 Dec 2023 21:27:42 +0000 (16:27 -0500)
committerLewis Hyatt <lhyatt@gmail.com>
Thu, 14 Mar 2024 11:33:02 +0000 (07:33 -0400)
commit6c166e55b15894ceb07dcc7b55f900e50e24ec5b
treebaad9623de6445515e183e7d243b2436295037f7
parentb7f70cfdb6f7ab369ecca14a99a0064d2a11ddd2
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.
gcc/testsuite/c-c++-common/cpp/has-include-next-2-dir/has-include-next-2.h [new file with mode: 0644]
gcc/testsuite/c-c++-common/cpp/has-include-next-2.c [new file with mode: 0644]
gcc/testsuite/lib/gcc-defs.exp
libcpp/files.cc
This page took 0.066056 seconds and 6 git commands to generate.