@@ -1840,19 +1840,6 @@ read_type_suppression(const ini::config::section& section)
changed_enumerator_names.push_back(p->get_value()->as_string());
}
- if (file_name_regex_str.empty()
- && file_name_not_regex_str.empty()
- && soname_regex_str.empty()
- && soname_not_regex_str.empty()
- && (!name_regex_prop || name_regex_prop->get_value()->as_string().empty())
- && (!name_not_regex_prop
- || name_not_regex_prop->get_value()->as_string().empty())
- && (!name_prop || name_prop->get_value()->as_string().empty())
- && !consider_type_kind
- && srcloc_not_regexp_str.empty()
- && srcloc_not_in.empty())
- return result;
-
result.reset(new type_suppression(label_str, name_regex_str, name_str));
if (consider_type_kind)
@@ -3288,32 +3275,16 @@ read_function_suppression(const ini::config::section& section)
parms.push_back(parm);
}
- if (!label_str.empty()
- || !name.empty()
- || !name_regex_str.empty()
- || !name_not_regex_str.empty()
- || !file_name_regex_str.empty()
- || !file_name_not_regex_str.empty()
- || !soname_regex_str.empty()
- || !soname_not_regex_str.empty()
- || !return_type_name.empty()
- || !return_type_regex_str.empty()
- || !sym_name.empty()
- || !sym_name_regex_str.empty()
- || !sym_name_not_regex_str.empty()
- || !sym_version.empty()
- || !sym_ver_regex_str.empty()
- || !parms.empty())
-
- result.reset(new function_suppression(label_str, name,
- name_regex_str,
- return_type_name,
- return_type_regex_str,
- parms,
- sym_name,
- sym_name_regex_str,
- sym_version,
- sym_ver_regex_str));
+ result.reset(new function_suppression(label_str,
+ name,
+ name_regex_str,
+ return_type_name,
+ return_type_regex_str,
+ parms,
+ sym_name,
+ sym_name_regex_str,
+ sym_version,
+ sym_ver_regex_str));
if ((drop_artifact_str == "yes" || drop_artifact_str == "true")
&& (!name.empty()
@@ -3324,11 +3295,11 @@ read_function_suppression(const ini::config::section& section)
|| !sym_name_not_regex_str.empty()))
result->set_drops_artifact_from_ir(true);
- if (result && !change_kind_str.empty())
+ if (!change_kind_str.empty())
result->set_change_kind
(function_suppression::parse_change_kind(change_kind_str));
- if (result && !allow_other_aliases.empty())
+ if (!allow_other_aliases.empty())
result->set_allow_other_aliases(allow_other_aliases == "yes"
|| allow_other_aliases == "true");
@@ -4157,27 +4128,15 @@ read_variable_suppression(const ini::config::section& section)
? type_name_regex_prop->get_value()->as_string()
: "";
- if (label_str.empty()
- && name_str.empty()
- && name_regex_str.empty()
- && name_not_regex_str.empty()
- && file_name_regex_str.empty()
- && file_name_not_regex_str.empty()
- && soname_regex_str.empty()
- && soname_not_regex_str.empty()
- && symbol_name.empty()
- && symbol_name_regex_str.empty()
- && symbol_name_not_regex_str.empty()
- && symbol_version.empty()
- && symbol_version_regex_str.empty()
- && type_name_str.empty()
- && type_name_regex_str.empty())
- return result;
-
- result.reset(new variable_suppression(label_str, name_str, name_regex_str,
- symbol_name, symbol_name_regex_str,
- symbol_version, symbol_version_regex_str,
- type_name_str, type_name_regex_str));
+ result.reset(new variable_suppression(label_str,
+ name_str,
+ name_regex_str,
+ symbol_name,
+ symbol_name_regex_str,
+ symbol_version,
+ symbol_version_regex_str,
+ type_name_str,
+ type_name_regex_str));
if ((drop_artifact_str == "yes" || drop_artifact_str == "true")
&& (!name_str.empty()
@@ -4194,7 +4153,7 @@ read_variable_suppression(const ini::config::section& section)
if (!symbol_name_not_regex_str.empty())
result->set_symbol_name_not_regex_str(symbol_name_not_regex_str);
- if (result && !change_kind_str.empty())
+ if (!change_kind_str.empty())
result->set_change_kind
(variable_suppression::parse_change_kind(change_kind_str));
@@ -4337,12 +4296,6 @@ read_file_suppression(const ini::config::section& section)
? soname_not_regex_prop->get_value()->as_string()
: "";
- if (file_name_regex_str.empty()
- && file_name_not_regex_str.empty()
- && soname_regex_str.empty()
- && soname_not_regex_str.empty())
- return result;
-
result.reset(new file_suppression(label_str,
file_name_regex_str,
file_name_not_regex_str));
@@ -1,10 +1,6 @@
-Functions changes summary: 0 Removed, 1 Changed, 1 Added functions
+Functions changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) functions
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-1 Added function:
-
- [A] 'function void bar()' {_Z3barv}
-
1 function with some indirect sub-type change:
[C] 'function void bar(S&)' has some indirect sub-type changes:
@@ -1,16 +1,3 @@
-Functions changes summary: 1 Removed, 1 Changed, 0 Added functions
+Functions changes summary: 0 Removed (1 filtered out), 0 Changed (1 filtered out), 0 Added functions
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-1 Removed function:
-
- [D] 'function void bar()' {_Z3barv}
-
-1 function with some indirect sub-type change:
-
- [C] 'function void bar(S*)' has some indirect sub-type changes:
- parameter 1 of type 'S*' has sub-type changes:
- in pointed to type 'struct S':
- type size changed from 32 to 64 (in bits)
- 1 data member insertion:
- 'unsigned int S::bar', at offset 32 (in bits)
-
@@ -1,16 +1,3 @@
Functions changes summary: 0 Removed, 0 Changed, 0 Added function
-Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
-
-1 Added variable:
-
- [A] 'int var1' {var1}
-
-1 Changed variable:
-
- [C] 'S* var0' was changed:
- type of variable changed:
- in pointed to type 'struct S':
- type size changed from 32 to 64 (in bits)
- 1 data member insertion:
- 'char S::m1', at offset 32 (in bits)
+Variables changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added (1 filtered out) variables
@@ -1,16 +1,3 @@
Functions changes summary: 0 Removed, 0 Changed, 0 Added function
-Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
-
-1 Removed variable:
-
- [D] 'int var1' {var1}
-
-1 Changed variable:
-
- [C] 'S* var0' was changed:
- type of variable changed:
- in pointed to type 'struct S':
- type size changed from 32 to 64 (in bits)
- 1 data member insertion:
- 'char S::m1', at offset 32 (in bits)
+Variables changes summary: 0 Removed (1 filtered out), 0 Changed (1 filtered out), 0 Added variables