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 31A193896817; Tue,  2 Mar 2021 20:47:26 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 31A193896817
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug c/99323] [9/10/11 Regression] ICE in add_hint, at
 diagnostic-show-locus.c:2234 since r8-379-gd1b5f5cc3cfd148e
Date: Tue, 02 Mar 2021 20:47:25 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: c
X-Bugzilla-Version: 11.0
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: P3
X-Bugzilla-Assigned-To: dmalcolm at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 9.4
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-99323-4-dyinDHOXCR@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-99323-4@http.gcc.gnu.org/bugzilla/>
References: <bug-99323-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: Tue, 02 Mar 2021 20:47:26 -0000

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

--- Comment #4 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by David Malcolm <dmalcolm@gcc.gnu.org>:

https://gcc.gnu.org/g:41fbacdd10305654b1d10f887fa3f4677f9b8f34

commit r11-7461-g41fbacdd10305654b1d10f887fa3f4677f9b8f34
Author: David Malcolm <dmalcolm@redhat.com>
Date:   Tue Mar 2 15:46:06 2021 -0500

    diagnostics: fix ICE on fix-it hints on very long lines [PR99323]

    PR c/99323 describes an ICE due to a failed assertion deep inside the
    fix-it printing machinery, where the fix-it hints on one line have not
    been properly sorted in layout's constructor.

    The underlying issue occurs when multiple fix-it hints affect a line
    wider that LINE_MAP_MAX_COLUMN_NUMBER, where the location_t values for
    characters after that threshold fall back to having column zero.

    It's not meaningful to try to handle fix-it hints without column
    information, so this patch rejects them as they are added to the
    rich_location, falling back to the "no fix-it hints on this diagnostic"
    case, fixing the crash.

    gcc/ChangeLog:
            PR c/99323
            * diagnostic-show-locus.c
            (selftest::test_one_liner_many_fixits_2): Fix accidental usage =
of
            column 0.

    gcc/testsuite/ChangeLog:
            PR c/99323
            * gcc.dg/pr99323-1.c: New test.
            * gcc.dg/pr99323-2.c: New test.

    libcpp/ChangeLog:
            PR c/99323
            * line-map.c (rich_location::maybe_add_fixit): Reject fix-it hi=
nts
            at column 0.=