From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B61843858033; Tue, 9 Nov 2021 13:45:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B61843858033 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5050] Generalize 'gcc/input.h:struct location_hash' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/master X-Git-Oldrev: 2fc9b4d7b0cbc88e9986486329abe899a07729de X-Git-Newrev: 088199e5d0fc0d54f48af0783a2630a773bbb387 Message-Id: <20211109134539.B61843858033@sourceware.org> Date: Tue, 9 Nov 2021 13:45:39 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 13:45:39 -0000 https://gcc.gnu.org/g:088199e5d0fc0d54f48af0783a2630a773bbb387 commit r12-5050-g088199e5d0fc0d54f48af0783a2630a773bbb387 Author: Thomas Schwinge Date: Tue Aug 31 23:30:25 2021 +0200 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'. Diff: --- gcc/input.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gcc/input.h b/gcc/input.h index f7b08bdc444..bc44ba2507f 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -36,6 +36,28 @@ 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'. */ +/* Per PR103157 "'gengtype': 'typedef' causing infinite-recursion code to be + generated", don't use + typedef int_hash + location_hash; + here. + + It works for a single-use case, but when using a 'struct'-based variant + struct location_hash + : int_hash {}; + in more than one place, 'gengtype' generates duplicate functions (thus: + "error: redefinition of 'void gt_ggc_mx(location_hash&)'" etc.). + Attempting to mark that one up with GTY options, we run into a 'gengtype' + "parse error: expected '{', have '<'", which probably falls into category + "understanding of C++ is limited", as documented in 'gcc/doc/gty.texi'. + + 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); @@ -233,8 +255,6 @@ public: location_t * GTY ((atomic)) m_locs; }; -struct location_hash : int_hash { }; - class GTY(()) string_concat_db { public: