From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
 id D42BD385800A; Wed,  1 Dec 2021 09:10:11 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D42BD385800A
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug preprocessor/103415] [12 Regression] ICE in
 cpp_interpret_string_1, at libcpp/charset.c:1739
Date: Wed, 01 Dec 2021 09:10:11 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: preprocessor
X-Bugzilla-Version: 12.0
X-Bugzilla-Keywords: ice-on-invalid-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: jakub at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 12.0
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-103415-4-1BJsC0XXPt@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-103415-4@http.gcc.gnu.org/bugzilla/>
References: <bug-103415-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-BeenThere: gcc-bugs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-bugs mailing list <gcc-bugs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-bugs>,
 <mailto:gcc-bugs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-bugs>,
 <mailto:gcc-bugs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Dec 2021 09:10:11 -0000

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

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

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

commit r12-5651-gac5fd364f0978c62ae759e7b36ce6b912a27546c
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed Dec 1 10:07:59 2021 +0100

    libcpp: Fix up #__VA_OPT__ handling [PR103415]

    stringify_arg uses pfile->u_buff to create the string literal.
    Unfortunately, paste_tokens -> _cpp_lex_direct -> lex_number ->
_cpp_unaligned_alloc
    can in some cases use pfile->u_buff too, which results in losing everyt=
hing
    prepared for the string literal until the token pasting.

    The following patch fixes that by not calling paste_token during the
    construction of the string literal, but doing that before.  All the tok=
ens
    we are processing have been pushed into a token buffer using
    tokens_buff_add_token so it is fine if we paste some of them in that bu=
ffer
    (successful pasting creates a new token in that buffer), move following
    tokens if any to make it contiguous, pop (throw away) the extra tokens =
at
    the end and then do stringify_arg.

    Also, paste_tokens now copies over PREV_WHITE and PREV_FALLTHROUGH flags
    from the original lhs token to the replacement token.  Copying that way
    the PREV_WHITE flag is needed for the #__VA_OPT__ handling and copying
    over PREV_FALLTHROUGH fixes the new Wimplicit-fallthrough-38.c test.

    2021-12-01  Jakub Jelinek  <jakub@redhat.com>

            PR preprocessor/103415
    libcpp/
            * macro.c (stringify_arg): Remove va_opt argument and va_opt
handling.
            (paste_tokens): On successful paste or in PREV_WHITE and
            PREV_FALLTHROUGH flags from the *plhs token to the new token.
            (replace_args): Adjust stringify_arg callers.  For #__VA_OPT__,
            perform token pasting in a separate loop before stringify_arg c=
all.
    gcc/testsuite/
            * c-c++-common/cpp/va-opt-8.c: New test.
            * c-c++-common/Wimplicit-fallthrough-38.c: New test.=