Add option to all sweep native methods

Summary: Option is off by default. This is a behavior-preserving change. Reviewed By: thezhangwei Differential Revision: D68137640 fbshipit-source-id: b6eca3bf51490afe4dd8452c8604db07c34355b5
kami-lang · Jan 17, 2025 · 0816a76 · 0816a76
1 parent e3ef341
commit 0816a76
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/opt/reachable-natives/ReachableNatives.cpp b/opt/reachable-natives/ReachableNatives.cpp
@@ -54,6 +54,9 @@ void ReachableNativesPass::bind_config() {
   bind("analyze_load_library", false, m_analyze_load_library);
   bind("additional_load_library_names", {}, m_additional_load_library_names);
   bind("sweep", false, m_sweep);
+  bind("sweep_native_methods", false, m_sweep_native_methods);
+  after_configuration(
+      [this] { always_assert(!m_sweep_native_methods || m_sweep); });
 }
 
 bool ReachableNativesPass::gather_load_library(
@@ -327,32 +330,35 @@ void ReachableNativesPass::run_pass(DexStoresVector& stores,
   mgr.set_metric("reachable_natives", reachable_natives.size());
   mgr.set_metric("unreachable_natives", unreachable_natives.size());
 
-  if (m_sweep) {
-    // Native methods and their declaring classes themselves must remain
-    // reachable, as they may get referenced by native registration code, so we
-    // re-include them in the reachable object set, and mark classes as abstract
-    // that are only kept for this reason.
+  if (m_sweep || m_sweep_native_methods) {
     size_t classes_abstracted{0};
-    for (auto* m : unreachable_natives) {
-      reachable_objects->mark(m);
-      self_recursive_fn(
-          [&](auto self, DexType* type) {
-            auto* cls = type_class(type);
-            if (!scope_set.count(cls) ||
-                reachable_objects->marked_unsafe(cls)) {
-              return;
-            }
-            reachable_objects->mark(cls);
-            self(self, cls->get_super_class());
-            for (auto* intf_type : *cls->get_interfaces()) {
-              self(self, intf_type);
-            }
-            if (!is_abstract(cls)) {
-              classes_abstracted++;
-              cls->set_access((cls->get_access() & ~ACC_FINAL) | ACC_ABSTRACT);
-            }
-          },
-          m->get_class());
+    if (!m_sweep_native_methods) {
+      // Native methods and their declaring classes themselves must remain
+      // reachable, as they may get referenced by native registration code, so
+      // we re-include them in the reachable object set, and mark classes as
+      // abstract that are only kept for this reason.
+      for (auto* m : unreachable_natives) {
+        reachable_objects->mark(m);
+        self_recursive_fn(
+            [&](auto self, DexType* type) {
+              auto* cls = type_class(type);
+              if (!scope_set.count(cls) ||
+                  reachable_objects->marked_unsafe(cls)) {
+                return;
+              }
+              reachable_objects->mark(cls);
+              self(self, cls->get_super_class());
+              for (auto* intf_type : *cls->get_interfaces()) {
+                self(self, intf_type);
+              }
+              if (!is_abstract(cls)) {
+                classes_abstracted++;
+                cls->set_access((cls->get_access() & ~ACC_FINAL) |
+                                ACC_ABSTRACT);
+              }
+            },
+            m->get_class());
+      }
     }
 
     auto before = reachability::count_objects(stores);

diff --git a/opt/reachable-natives/ReachableNatives.h b/opt/reachable-natives/ReachableNatives.h
@@ -81,4 +81,5 @@ class ReachableNativesPass : public Pass {
   std::unordered_set<DexMethod*> m_load_library_unsafe_methods;
   std::unordered_set<DexMethod*> m_load_library_methods;
   bool m_sweep;
+  bool m_sweep_native_methods;
 };