From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 3560C3857422 for ; Thu, 2 Sep 2021 13:59:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3560C3857422 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: xEF7pPo1od9ajqHeJNF3sJemIDT4IrRhB3fFOB6kdcNZdfUgSC1FZ87guF2yaXgKrmQOXGbAkx 7N32jXoy8wosPH2WHo90/QfCIxJ4j2TqluixHbKknLHAfk9IQx2nK+wVSVR4HqZqFc2hYKKfFA izZJy2nY0dAkJqnNV6nVO5U84OGz1j78rqCFopoudNLK4pKgOyCY242+NYLxVbyZjX+igTm3MQ BAxgz2eRoxNVmN6hN+aFKfEZvSHHxuSYgX9e196Dl5XE3/iXxYEsWQ1Zo7u9SUrNY8mR6s4PKS Fmu/vCqkVNSZqFo6vDo6cyoN X-IronPort-AV: E=Sophos;i="5.84,372,1620720000"; d="scan'208,223";a="65423743" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 02 Sep 2021 05:59:23 -0800 IronPort-SDR: 0tdKR2/v+XkRAhp+5JlBwdcOk7FPyCKPv8WlAiwdQXa8elH7MyW/lp2PrhRcuSZDMvM0DvUEXQ 6QJoHlWyNuhFqGQwaQF4Mg2CqmJ3fEmry+Z7zWNCGjBZAx3+0/K9GbUwHDRaYhAXKoh6i1u6pe ac/t5Q4+ihisX8LaAJQH4xV5fYgIPOAFBZK594nHzPiE2pgl05froxT42R1pJYwmaWN/umaA6G e4y/Q+j/yQLdkvpJ+RFoiucHnYdZvwKJ4OucwOHrzXTsICp7mRJjY/f3H1GDiaYWdl7gqe5lS5 w/Y= From: Thomas Schwinge To: David Malcolm , Subject: Re: [Committed] [PATCH 2/4] (v4) On-demand locations within string-literals In-Reply-To: <1470421018.8203.93.camel@redhat.com> References: <1469841382.17384.65.camel@redhat.com> <1470239113-42666-1-git-send-email-dmalcolm@redhat.com> <1470239113-42666-2-git-send-email-dmalcolm@redhat.com> <1470338501.8203.47.camel@redhat.com> <46aafdfa-3cbe-8072-cef1-c827ec144b7e@redhat.com> <1470421018.8203.93.camel@redhat.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Thu, 2 Sep 2021 15:59:14 +0200 Message-ID: <871r67w025.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Sep 2021 13:59:25 -0000 --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2016-08-05T14:16:58-0400, David Malcolm wrote: > Committed to trunk as r239175; I'm attaching the final version of the > patch for reference. David, you've added here 'gcc/input.h:struct location_hash' (see quoted below), which will be useful elsewhere, so: > --- a/gcc/input.c > +++ b/gcc/input.c > +/* Internal function. Canonicalize LOC into a form suitable for > + use as a key within the database, stripping away macro expansion, > + ad-hoc information, and range information, using the location of > + the start of LOC within an ordinary linemap. */ > + > +location_t > +string_concat_db::get_key_loc (location_t loc) > +{ > + loc =3D linemap_resolve_location (line_table, loc, LRK_SPELLING_LOCATI= ON, > + NULL); > + > + loc =3D get_range_from_loc (line_table, loc).m_start; > + > + return loc; > +} OK to push the attached "Harden 'gcc/input.c:string_concat_db::get_key_loc'"? (This fell out of my analysis for development work elsewhere.) > --- a/gcc/input.h > +++ b/gcc/input.h > +struct location_hash : int_hash { }; > + > +class GTY(()) string_concat_db > +{ > +[...] > + hash_map *m_table; > +}; OK to push the attached "Generalize 'gcc/input.h:struct location_hash'"? Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-Harden-gcc-input.c-string_concat_db-get_key_loc.patch" >From 521c94471ae2f044f8cca8025bfa8db2d2936aea Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 31 Aug 2021 23:05:46 +0200 Subject: [PATCH 1/2] Harden 'gcc/input.c:string_concat_db::get_key_loc' We're using 'UNKNOWN_LOCATION' as a spare value for 'Empty', so should ascertain that we don't use it as a key additionally. Follow-up to r239175 (commit 88fa5555a309e5d6c6171b957daaf2f800920869) "On-demand locations within string-literals". gcc/ * input.c (string_concat_db::get_key_loc): Harden. --- gcc/input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/input.c b/gcc/input.c index 4b809862e02..98b8bb64618 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -1483,6 +1483,9 @@ string_concat_db::get_key_loc (location_t loc) loc = get_range_from_loc (line_table, loc).m_start; + /* Ascertain that 'loc' is valid as a key in 'm_table'. */ + gcc_checking_assert (!RESERVED_LOCATION_P (loc)); + return loc; } -- 2.33.0 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0002-Generalize-gcc-input.h-struct-location_hash.patch" >From 349a3172f64db93ee98ea39b36489b702b6596ab Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 31 Aug 2021 23:30:25 +0200 Subject: [PATCH 2/2] Generalize 'gcc/input.h:struct location_hash' This is currently only used here ('gcc/input.h:class string_concat_db'), but is actually generally useful, so advertize it as such. Per the rationale given, we may use 'BUILTINS_LOCATION' as spare value for 'Deleted', in addition to the existing use of 'UNKNOWN_LOCATION' as spare value for 'Empty'. gcc/ * input.h (location_hash): Use 'BUILTINS_LOCATION' as spare value for 'Deleted'. Turn into a '#define'. --- gcc/input.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gcc/input.h b/gcc/input.h index e6881072c5f..46971a2684c 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -36,6 +36,25 @@ extern GTY(()) class line_maps *saved_line_table; both UNKNOWN_LOCATION and BUILTINS_LOCATION fit into that. */ STATIC_ASSERT (BUILTINS_LOCATION < RESERVED_LOCATION_COUNT); +/* Hasher for 'location_t' values satisfying '!RESERVED_LOCATION_P', thus able + to use 'UNKNOWN_LOCATION'/'BUILTINS_LOCATION' as spare values for + 'Empty'/'Deleted'. */ +/* If the following is used more than once, 'gengtype' generates duplicate + functions (thus: "error: redefinition of 'void gt_ggc_mx(location_hash&)'" + etc.): + + struct location_hash + : int_hash {}; + + Likewise for this: + + typedef int_hash + location_hash; + + Thus, use a plain ol' '#define': +*/ +#define location_hash int_hash + extern bool is_location_from_builtin_token (location_t); extern expanded_location expand_location (location_t); @@ -230,8 +249,6 @@ public: location_t * GTY ((atomic)) m_locs; }; -struct location_hash : int_hash { }; - class GTY(()) string_concat_db { public: -- 2.33.0 --=-=-=--