[v3,11/21] Compile suppression regexes earlier.

  Regexes are used in suppression specifications for various things.
They are currently compiled on first use, rather than on construction
of the specifications.

This patches changes the suppression specification types to hold
compiled regexes directly which is a significant simplification and is
a prerequisite for early error reporting.

There are no behavioural changes.

	* include/abg-suppression.h (suppression_base): In
	constructor, take regex arguments as regex_t_sptr. Replace all
	set_*_regex_str and get_*_regex_str methods with set_*_regex
	and get_*_regex methods.
	(type_suppression): In constructor, take regex arguments as
	regex_t_sptr. Replace all set_*_regex_str and get_*_regex_str
	methods with set_*_regex and get_*_regex methods.
	(function_suppression): In constructor, take regex arguments
	as regex_t_sptr. Replace all set_*_regex_str and
	get_*_regex_str methods with set_*_regex and get_*_regex
	methods.
	(function_suppression::parameter_spec): In constructor, take
	regex arguments as regex_t_sptr. Replace all set_*_regex_str and
	get_*_regex_str methods with set_*_regex and get_*_regex
	methods.
	(variable_suppression): In constructor, take regex arguments
	as regex_t_sptr. Replace all set_*_regex_str and get_*_regex_str
	methods with set_*_regex and get_*_regex methods.
	(file_suppression): In constructor, take regex arguments
	as regex_t_sptr.
	* src/abg-suppression-priv.h (suppression_base::priv): Drop
	all *_regex_str_ members. Drop mutable qualifier on
	all *_regex_ members. In constructor, take regexes instead of
	strings for regex arguments. Update all get_*_regex methods to
	remove regex compilation and update comments.
	(function_suppression::parameter_spec::priv): Drop
	all *_regex_str_ members. Drop mutable qualifier on
	all *_regex_ members. In constructor, take regexes instead of
	strings for regex arguments. Update get_*_regex methods to
	remove regex compilation and update comments.
	(function_suppression::priv): Drop all *_regex_str_ members.
	Drop mutable qualifier on all *_regex_ members. In constructor,
	take regexes instead of strings for regex arguments. Update
	all get_*_regex methods to remove regex compilation and
	update comments.
	(variable_suppression::priv): Drop all *_regex_str_ members.
	Drop mutable qualifier on all *_regex_ members. In
	constructor, take regexes instead of strings for regex
	arguments. Update all get_*_regex methods to remove
	regex compilation and update comments.
	(type_suppression::priv): Drop all *_regex_str_ members.
	Drop mutable qualifier on all *_regex_ members. In constructor,
	take regexes instead of strings for regex arguments. Update
	all get_*_regex methods to remove regex compilation and
	update comments. Drop set_type_name_regex_str and
	get_type_name_regex_str methods.
	* src/abg-suppression.cc (suppression_base): In constructor,
	take regexes instead of strings for regex arguments. Replace
	all set_*_regex_str and get_*_regex_str methods with
	set_*_regex and get_*_regex methods. Update
	has_file_name_related_property and has_soname_related_property
	methods.
	(type_suppression): In constructor, take regexes instead of
	strings for regex arguments. Replace all set_*_regex_str and
	get_*_regex_str methods with set_*_regex and get_*_regex
	methods. Update has_file_name_related_property and
	has_soname_related_property methods.
	(read_type_suppression): Compile regexes instead of keeping
	them as strings. Pass them to type_suppression constructor and
	setters.
	(function_suppression::parameter_spec): In constructor, take
	regexes instead of strings for regex arguments. Replace all
	set_*_regex_str and get_*_regex_str methods with set_*_regex and
	get_*_regex methods.
	(function_suppression): In constructor, take regexes instead
	of strings for regex arguments. Replace all set_*_regex_str
	and get_*_regex_str methods with set_*_regex and get_*_regex
	methods. Update suppresses_function_symbol method.
	(read_parameter_spec_from_string): Change type of
	type_name_regex from string to regex and compile when needed.
	(read_function_suppression): Compile regexes instead of
	keeping them as strings. Pass them to function_suppression
	constructor and setters.
	(variable_suppression): In constructor, take regexes instead
	of strings for regex arguments. Replace all set_*_regex_str
	and get_*_regex_str methods with set_*_regex and get_*_regex
	methods.
	(file_suppression): In constructor, take regexes instead of
	strings for regex arguments. Replace all set_*_regex_str and
	get_*_regex_str methods with set_*_regex and get_*_regex
	methods.
	* src/abg-tools-utils.cc (handle_file_entry): Compile and
	check regex for /usr/include.
	(gen_suppr_spec_from_kernel_abi_whitelists):
	Compile and check whitelisting regex.
	* tests/test-kmi-whitelist.cc (random_symbols) Add array of
	symbols. (test_suppressions_are_consistent): Rework to test by
	matching regexes against symbols, now that uncompiled regex
	strings are no longer available.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 include/abg-suppression.h   | 165 ++++-----
 src/abg-suppression-priv.h  | 357 ++++---------------
 src/abg-suppression.cc      | 694 ++++++++++++++++++------------------
 src/abg-tools-utils.cc      |  17 +-
 tests/test-kmi-whitelist.cc |  60 +++-
 5 files changed, 583 insertions(+), 710 deletions(-)

Message ID	20200424092132.150547-12-gprocida@google.com
State	Superseded
Headers	From: gprocida@google.com (Giuliano Procida) Date: Fri, 24 Apr 2020 10:21:22 +0100 Subject: [PATCH v3 11/21] Compile suppression regexes earlier. In-Reply-To: <20200424092132.150547-1-gprocida@google.com> References: <20200423154441.170531-1-gprocida@google.com> <20200424092132.150547-1-gprocida@google.com> Message-ID: <20200424092132.150547-12-gprocida@google.com>
Series	Simplify regex and suppression parsing. \| [v3,00/21] Simplify regex and suppression parsing. [v3,01/21] Move regex definitions to own files. [v3,02/21] Move libxml bits out of abg-sptr-utils.h. [v3,03/21] Simplify generation of symbol whitelist regex. [v3,04/21] Escape names used in symbol whitelisting regex. [v3,05/21] abg-suppression.cc: More uniform variable naming. [v3,06/21] diff suppression: Fix handling of change kinds. [v3,07/21] Add POSIX regex wrapper functions. [v3,08/21] Use regex::compile wrapper instead of regcomp. [v3,09/21] Use regex::match wrapper instead of regexec. [v3,10/21] Refactor read_parameter_spec_from_string logic. [v3,11/21] Compile suppression regexes earlier. [v3,12/21] Reduce direct access to suppression priv_ members. [v3,13/21] Move match methods from priv to suppression_base. [v3,14/21] Remove suppression types' priv class methods. [v3,15/21] abg-suppression.cc: More consistent regex matching. [v3,16/21] abg-tools-utils.cc: Assert generated regexes OK. [v3,17/21] Refactor suppression property string parsing. [v3,18/21] Refactor suppression property regex parsing. [v3,19/21] Warn if user-supplied regexes fail to compile. [v3,20/21] Default construct suppression types. [v3,21/21] Remove unused suppression type priv constructors.

[v3,11/21] Compile suppression regexes earlier.

Commit Message

Patch