From d346292fc95f1990abbc9f6a4a8eb89be0f0e88d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 31 Aug 2021 23:35:15 +0200 Subject: [PATCH] Use 'location_hash' for 'gcc/diagnostic-spec.h:nowarn_map' Instead of hard-coded '0'/'UINT_MAX', we now use the 'RESERVED_LOCATION_P' values 'UNKNOWN_LOCATION'/'BUILTINS_LOCATION' as spare values for 'Empty'/'Deleted', and generally simplify the code. gcc/ * diagnostic-spec.h (typedef xint_hash_t) (typedef xint_hash_map_t): Replace with... (typedef nowarn_map_t): ... this. (nowarn_map): Adjust. * diagnostic-spec.c (nowarn_map, suppress_warning_at): Likewise. --- gcc/diagnostic-spec.c | 4 ++-- gcc/diagnostic-spec.h | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gcc/diagnostic-spec.c b/gcc/diagnostic-spec.c index 85ffb725c02..d1e563d19ba 100644 --- a/gcc/diagnostic-spec.c +++ b/gcc/diagnostic-spec.c @@ -107,7 +107,7 @@ nowarn_spec_t::nowarn_spec_t (opt_code opt) /* A mapping from a 'location_t' to the warning spec set for it. */ -GTY(()) xint_hash_map_t *nowarn_map; +GTY(()) nowarn_map_t *nowarn_map; /* Return the no-warning disposition for location LOC and option OPT or for all/any otions by default. */ @@ -163,7 +163,7 @@ suppress_warning_at (location_t loc, opt_code opt /* = all_warnings */, return false; if (!nowarn_map) - nowarn_map = xint_hash_map_t::create_ggc (32); + nowarn_map = nowarn_map_t::create_ggc (32); nowarn_map->put (loc, optspec); return true; diff --git a/gcc/diagnostic-spec.h b/gcc/diagnostic-spec.h index e54e9e3ddbe..368b75f3254 100644 --- a/gcc/diagnostic-spec.h +++ b/gcc/diagnostic-spec.h @@ -130,14 +130,9 @@ operator!= (const nowarn_spec_t &lhs, const nowarn_spec_t &rhs) return !(lhs == rhs); } -/* Per PR103157 "'gengtype': 'typedef' causing infinite-recursion code to be - generated", don't use - typedef int_hash xint_hash_t; - here. */ -struct xint_hash_t : int_hash {}; -typedef hash_map xint_hash_map_t; +typedef hash_map nowarn_map_t; /* A mapping from a 'location_t' to the warning spec set for it. */ -extern GTY(()) xint_hash_map_t *nowarn_map; +extern GTY(()) nowarn_map_t *nowarn_map; #endif // DIAGNOSTIC_SPEC_H_INCLUDED -- 2.33.0