OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Thomas Schwinge 2021-08-31 23:35:15 +02:00
parent bcebd05720
commit f861ed8b29
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/diagnostic-spec.c
View File

@ -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;

9
gcc/diagnostic-spec.h
View File

@ -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