diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2021-08-31 23:35:15 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2021-11-15 17:57:54 +0100 |
| commit | f861ed8b29a5eb6164d1ddbcfbb6232dddae713f (patch) | |
| tree | 45828755f57b256a48feada408ba90b1733b42ab /gcc | |
| parent | bcebd05720540e257b520737de6e087a328c1f8b (diff) | |
| download | gcc-f861ed8b29a5eb6164d1ddbcfbb6232dddae713f.zip gcc-f861ed8b29a5eb6164d1ddbcfbb6232dddae713f.tar.gz gcc-f861ed8b29a5eb6164d1ddbcfbb6232dddae713f.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/diagnostic-spec.c | 4 | ||||
| -rw-r--r-- | 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 85ffb72..d1e563d 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 e54e9e3..368b75f 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<location_t, 0, UINT_MAX> xint_hash_t; - here. */ -struct xint_hash_t : int_hash<location_t, 0, UINT_MAX> {}; -typedef hash_map<xint_hash_t, nowarn_spec_t> xint_hash_map_t; +typedef hash_map<location_hash, nowarn_spec_t> 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 |