abitidy: postone reachability attribute clearing pass am: 52e1656d1a
Original change: https://android-review.googlesource.com/c/platform/external/libabigail/+/1996592
Change-Id: I9c5f6fc0921c9a2d5583291624768b8e37be1e6c
diff --git a/tools/abitidy.cc b/tools/abitidy.cc
index a8e0f91..0a664e4 100644
--- a/tools/abitidy.cc
+++ b/tools/abitidy.cc
@@ -1269,11 +1269,11 @@
int opt_indentation = 2;
bool opt_normalise_anonymous = false;
bool opt_reanonymise_anonymous = false;
- bool opt_clear_non_reachable = false;
bool opt_discard_naming_typedefs = false;
bool opt_prune_unreachable = false;
bool opt_report_untyped = false;
bool opt_abort_on_untyped = false;
+ bool opt_clear_non_reachable = false;
bool opt_eliminate_duplicates = false;
bool opt_report_conflicts = false;
bool opt_sort = false;
@@ -1287,14 +1287,14 @@
<< " [-S|--symbols file]\n"
<< " [-L|--locations {column|line|file|none}]\n"
<< " [-I|--indentation n]\n"
- << " [-a|--all] (implies -n -r -b -t -p -u -e -c -s -d)\n"
+ << " [-a|--all] (implies -n -r -t -p -u -b -e -c -s -d)\n"
<< " [-n|--[no-]normalise-anonymous]\n"
<< " [-r|--[no-]reanonymise-anonymous]\n"
- << " [-b|--[no-]clear-non-reachable]\n"
<< " [-t|--[no-]discard-naming-typedefs]\n"
<< " [-p|--[no-]prune-unreachable]\n"
<< " [-u|--[no-]report-untyped]\n"
<< " [-U|--abort-on-untyped-symbols]\n"
+ << " [-b|--[no-]clear-non-reachable]\n"
<< " [-e|--[no-]eliminate-duplicates]\n"
<< " [-c|--[no-]report-conflicts]\n"
<< " [-s|--[no-]sort]\n"
@@ -1333,9 +1333,9 @@
else if (arg == "-a" || arg == "--all")
opt_normalise_anonymous = opt_reanonymise_anonymous
= opt_discard_naming_typedefs
- = opt_clear_non_reachable
= opt_prune_unreachable
= opt_report_untyped
+ = opt_clear_non_reachable
= opt_eliminate_duplicates
= opt_report_conflicts
= opt_sort
@@ -1349,10 +1349,6 @@
opt_reanonymise_anonymous = true;
else if (arg == "--no-reanonymise-anonymous")
opt_reanonymise_anonymous = false;
- else if (arg == "-b" || arg == "--clear-non-reachable")
- opt_clear_non_reachable = true;
- else if (arg == "--no-clear-non-reachable")
- opt_clear_non_reachable = false;
else if (arg == "-t" || arg == "--discard-naming-typedefs")
opt_discard_naming_typedefs = true;
else if (arg == "--no-discard-naming-typedefs")
@@ -1367,6 +1363,10 @@
opt_report_untyped = false;
else if (arg == "-U" || arg == "--abort-on-untyped-symbols")
opt_abort_on_untyped = true;
+ else if (arg == "-b" || arg == "--clear-non-reachable")
+ opt_clear_non_reachable = true;
+ else if (arg == "--no-clear-non-reachable")
+ opt_clear_non_reachable = false;
else if (arg == "-e" || arg == "--eliminate-duplicates")
opt_eliminate_duplicates = true;
else if (arg == "--no-eliminate-duplicates")
@@ -1435,10 +1435,6 @@
handle_anonymous_types(opt_normalise_anonymous, opt_reanonymise_anonymous,
opt_discard_naming_typedefs, root);
- // Clear unwanted non-reachable attributes.
- if (opt_clear_non_reachable)
- clear_non_reachable(root);
-
// Prune unreachable elements and/or report untyped symbols.
size_t untyped_symbols = 0;
if (opt_prune_unreachable || opt_report_untyped || opt_abort_on_untyped)
@@ -1454,6 +1450,10 @@
if (opt_locations > LocationInfo::COLUMN)
limit_locations(opt_locations, root);
+ // Clear unwanted non-reachable attributes.
+ if (opt_clear_non_reachable)
+ clear_non_reachable(root);
+
// Eliminate complete duplicates and extra fragments of types.
// Report conflicting type defintions.
// Record whether there are namespace scope conflicts.
