https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93545

--- Comment #8 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:c04babd9dfa5c63c10d65f1bd3fb8cf503ab739d

commit r10-6428-gc04babd9dfa5c63c10d65f1bd3fb8cf503ab739d
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Tue Feb 4 13:38:16 2020 +0100

    libcpp: Fix ICEs on __has_include syntax errors [PR93545]

    Some of the following testcases ICE, because one of the cpp_get_token
    calls in builtin_has_include reads the CPP_EOF token but the caller isn't
    aware that CPP_EOF has been reached and will do another cpp_get_token.
    get_token_no_padding is something that is use by the
    has_attribute/has_builtin callbacks, which will first peek and will not
    consume CPP_EOF (but will consume other tokens).  The !SEEN_EOL ()
    check on the other side doesn't work anymore and isn't really needed,
    as we don't consume the EOF.  The change adds one further error to the
    pr88974.c testcase, if we wanted just one error per __has_include,
    we could add some boolean whether we've emitted errors already and
    only emit the first one we encounter (not implemented).

    2020-02-04  Jakub Jelinek  <ja...@redhat.com>

        PR preprocessor/93545
        * macro.c (cpp_get_token_no_padding): New function.
        (builtin_has_include): Use it instead of cpp_get_token.  Don't check
        SEEN_EOL.

        * c-c++-common/cpp/pr88974.c: Expect another diagnostics during error
        recovery.
        * c-c++-common/cpp/pr93545-1.c: New test.
        * c-c++-common/cpp/pr93545-2.c: New test.
        * c-c++-common/cpp/pr93545-3.c: New test.
        * c-c++-common/cpp/pr93545-4.c: New test.

Reply via email to