From 5bce089f2384ea83562a981ae3adafc835094d4e Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Tue, 16 Sep 2014 15:14:35 +0200 Subject: [PATCH] Emit reports about not-yet categorized diff nodes * include/abg-comparison.h (NO_CHANGE_CATEGORY): Better comment this enumerator. * src/abg-comparison.cc (diff::is_filtered_out): Not-yet categorized changes are not filtered out anymore. (distinct_diff::report): Avoid extraneous new line here. Signed-off-by: Dodji Seketeli --- include/abg-comparison.h | 3 ++- src/abg-comparison.cc | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index 68be39b1..3acf067f 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -230,7 +230,8 @@ public: /// into, regarding the kind of changes it represents. enum diff_category { - /// This means the diff node does not carry any (meaningful) change. + /// This means the diff node does not carry any (meaningful) change, + /// or that it carries changes that have not yet been categorized. NO_CHANGE_CATEGORY = 0, /// This means the diff node is *NOT* redundant. The reason why we diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index 3da5a074..743e11d0 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -812,6 +812,9 @@ diff::is_filtered_out() const if (!(get_category() & NOT_REDUNDANT_CATEGORY)) return true; + if (get_category() == NO_CHANGE_CATEGORY) + return false; + // Ignore the NOT_REDUNDANT_CATEGORY bit when comparing allowed // categories and the current set of categories. return !((get_category() & ~NOT_REDUNDANT_CATEGORY) @@ -945,11 +948,8 @@ distinct_diff::report(ostream& out, const string& indent) const assert(diff->to_be_reported()); diff->report(out, indent + " "); } -else - if (!report_size_and_alignment_changes(f, s, context(), out, indent, true)) - out << indent << "but no size changed\n"; else - out << "\n"; + report_size_and_alignment_changes(f, s, context(), out, indent, true); } /// Traverse an instance of distinct_diff.