abitidy: postone reachability attribute clearing pass am: 52e1656d1a am: ebd2d3dda1 am: 3d8723ba7dt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-release

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

Change-Id: I8dfc6e46f1895169eed559a51a8b054be4d80cfe

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.