abitidy: postone reachability attribute clearing pass am: 52e1656d1a am: ebd2d3dda1 am: 3d8723ba7d am: 075b1a0c12aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseaml_tz4_332714010

Original change: https://android-review.googlesource.com/c/platform/external/libabigail/+/1996592

Change-Id: Ica076b9f47176347108cc0307180ee374a72c467

1 files changed, 12 insertions, 12 deletions

diff --git a/tools/abitidy.cc b/tools/abitidy.cc
index a8e0f910..0a664e49 100644
--- a/tools/abitidy.cc
+++ b/tools/abitidy.cc
@@ -1269,11 +1269,11 @@ main(int argc, char* argv[])
   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 @@ main(int argc, char* argv[])
               << "  [-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 @@ main(int argc, char* argv[])
       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 @@ main(int argc, char* argv[])
         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 @@ main(int argc, char* argv[])
         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 @@ main(int argc, char* argv[])
     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 @@ main(int argc, char* argv[])
   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.