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 5AE6C3858C66; Tue, 20 Jun 2023 22:04:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AE6C3858C66
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1687298654;
	bh=vHcFUhTSuYKqACCsbC8ijkGebe0tsYKvnInScXjTD9g=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=G1Xd4mslJmCnYQmnHBK28aGnXKQbtwbigximQhkiJ5++OA6ZKIhAHfGv/uwolEY5T
	 8Ef69nxEty2AKoghB/6VdQlEuaORkBtdtaq8DljiLcfSABA1t43LUm0OE/3YC7qPOf
	 WpRcyvtfU1vlh9tYTShivPPYQApQw/chuk5p1yYo=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug c++/66290] wrong location for -Wunused-macros
Date: Tue, 20 Jun 2023 22:04:13 +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: 7.0
X-Bugzilla-Keywords: diagnostic
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: NEW
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-66290-4-bQC0ztwi2r@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-66290-4@http.gcc.gnu.org/bugzilla/>
References: <bug-66290-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
List-Id: <gcc-bugs.sourceware.org>

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

--- Comment #9 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Lewis Hyatt <lhyatt@gcc.gnu.org>:

https://gcc.gnu.org/g:4f3be7cbebce8ec9e0c5d9340b2772581454b862

commit r14-2004-g4f3be7cbebce8ec9e0c5d9340b2772581454b862
Author: Lewis Hyatt <lhyatt@gmail.com>
Date:   Wed Aug 3 10:46:23 2022 -0400

    libcpp: Improve location for macro names [PR66290]

    When libcpp reports diagnostics whose locus is a macro name (such as for
    -Wunused-macros), it uses the location in the cpp_macro object that was
    stored by _cpp_new_macro. This is currently set to pfile->directive_lin=
e,
    which contains the line number only and no column information. This pat=
ch
    changes the stored location to the src_loc for the token defining the m=
acro
    name, which includes the location and range information.

    libcpp/ChangeLog:

            PR c++/66290
            * macro.cc (_cpp_create_definition): Add location argument.
            * internal.h (_cpp_create_definition): Adjust prototype.
            * directives.cc (do_define): Pass new location argument to
            _cpp_create_definition.
            (do_undef): Stop passing inferior location to
cpp_warning_with_line;
            the default from cpp_warning is better.
            (cpp_pop_definition): Pass new location argument to
            _cpp_create_definition.
            * pch.cc (cpp_read_state): Likewise.

    gcc/testsuite/ChangeLog:

            PR c++/66290
            * c-c++-common/cpp/macro-ranges.c: New test.
            * c-c++-common/cpp/line-2.c: Adapt to check for column informat=
ion
            on macro-related libcpp warnings.
            * c-c++-common/cpp/line-3.c: Likewise.
            * c-c++-common/cpp/macro-arg-count-1.c: Likewise.
            * c-c++-common/cpp/pr58844-1.c: Likewise.
            * c-c++-common/cpp/pr58844-2.c: Likewise.
            * c-c++-common/cpp/warning-zero-location.c: Likewise.
            * c-c++-common/pragma-diag-14.c: Likewise.
            * c-c++-common/pragma-diag-15.c: Likewise.
            * g++.dg/modules/macro-2_d.C: Likewise.
            * g++.dg/modules/macro-4_d.C: Likewise.
            * g++.dg/modules/macro-4_e.C: Likewise.
            * g++.dg/spellcheck-macro-ordering.C: Likewise.
            * gcc.dg/builtin-redefine.c: Likewise.
            * gcc.dg/cpp/Wunused.c: Likewise.
            * gcc.dg/cpp/redef2.c: Likewise.
            * gcc.dg/cpp/redef3.c: Likewise.
            * gcc.dg/cpp/redef4.c: Likewise.
            * gcc.dg/cpp/ucnid-11-utf8.c: Likewise.
            * gcc.dg/cpp/ucnid-11.c: Likewise.
            * gcc.dg/cpp/undef2.c: Likewise.
            * gcc.dg/cpp/warn-redefined-2.c: Likewise.
            * gcc.dg/cpp/warn-redefined.c: Likewise.
            * gcc.dg/cpp/warn-unused-macros-2.c: Likewise.
            * gcc.dg/cpp/warn-unused-macros.c: Likewise.=