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 7F113396AC1B; Wed, 16 Jun 2021 18:33:51 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F113396AC1B
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug preprocessor/96391] [10 Regression] ICE in
 linemap_compare_locations on "CONST VOID" in large C++ files
Date: Wed, 16 Jun 2021 18:33:50 +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: 10.2.1
X-Bugzilla-Keywords: ice-on-valid-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: P2
X-Bugzilla-Assigned-To: dmalcolm at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 10.4
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-96391-4-kCKBrTcxsH@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-96391-4@http.gcc.gnu.org/bugzilla/>
References: <bug-96391-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, 16 Jun 2021 18:33:51 -0000

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

--- Comment #26 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-11 branch has been updated by Jason Merrill
<jason@gcc.gnu.org>:

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

commit r11-8583-gbb2e908638758097e261bca1a4825d171a18af9c
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Jun 14 17:37:43 2021 -0400

    libcpp: location comparison within macro [PR100796]

    The patch for 96391 changed linemap_compare_locations to give up on
    comparing locations from macro expansions if we don't have column
    information.  But in this testcase, the BOILERPLATE macro is multiple l=
ines
    long, so we do want to compare locations within the macro.  So this pat=
ch
    moves the LINE_MAP_MAX_LOCATION_WITH_COLS check inside the block, to us=
e it
    for failing gracefully.

            PR c++/100796
            PR preprocessor/96391

    libcpp/ChangeLog:

            * line-map.c (linemap_compare_locations): Only use comparison w=
ith
            LINE_MAP_MAX_LOCATION_WITH_COLS to avoid abort.

    gcc/testsuite/ChangeLog:

            * g++.dg/plugin/location-overflow-test-pr100796.c: New test.
            * g++.dg/plugin/plugin.exp: Run it.=