Add requires/preserves/establishes for HasSourceBlocks checker

Summary: InsertSourceBlocksPass establishes it. Passes which may use profile info require it. InstrumentPass destroys/does not preserve it. Reviewed By: agampe Differential Revision: D44941800 fbshipit-source-id: 076c65324b627857f883b56ca825884f3e6627cd
facebook · Apr 14, 2023 · 88ac642 · 88ac642
1 parent c0f74b2
commit 88ac642
Show file tree

Hide file tree

Showing 103 changed files with 645 additions and 9 deletions.
diff --git a/analysis/ip-reflection-analysis/IPReflectionAnalysis.h b/analysis/ip-reflection-analysis/IPReflectionAnalysis.h
@@ -15,6 +15,13 @@ class IPReflectionAnalysisPass : public Pass {
  public:
   IPReflectionAnalysisPass()
       : Pass("IPReflectionAnalysisPass", Pass::ANALYSIS) {}
+
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("max_iteration", 20U, m_max_iteration);
     bind("export_results", false, m_export_results,

diff --git a/analysis/max-depth/MaxDepthAnalysis.h b/analysis/max-depth/MaxDepthAnalysis.h
@@ -15,6 +15,13 @@
 class MaxDepthAnalysisPass : public Pass {
  public:
   MaxDepthAnalysisPass() : Pass("MaxDepthAnalysisPass", Pass::ANALYSIS) {}
+
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override { bind("max_iteration", 20U, m_max_iteration); }
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 

diff --git a/opt/access-marking/AccessMarking.h b/opt/access-marking/AccessMarking.h
@@ -13,6 +13,12 @@ class AccessMarkingPass : public Pass {
  public:
   AccessMarkingPass() : Pass("AccessMarkingPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   std::string get_config_doc() override {
     return "This pass will mark class, methods, and fields final, when able to "
            "do so. This is generally advantageous for performance. It will "

diff --git a/opt/analyze-pure-method/PureMethods.h b/opt/analyze-pure-method/PureMethods.h
@@ -30,6 +30,12 @@ class AnalyzePureMethodsPass : public Pass {
 
   AnalyzePureMethodsPass() : Pass("AnalyzePureMethodsPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 
   bool is_editable_cfg_friendly() override { return true; }

diff --git a/opt/annokill/AnnoKill.h b/opt/annokill/AnnoKill.h
@@ -115,6 +115,13 @@ class AnnoKill {
 class AnnoKillPass : public Pass {
  public:
   AnnoKillPass() : Pass("AnnoKillPass") {}
+
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   explicit AnnoKillPass(const std::string& name) : Pass(name) {}
 
   void bind_config() override {

diff --git a/opt/app_module_usage/AppModuleUsage.h b/opt/app_module_usage/AppModuleUsage.h
@@ -45,6 +45,12 @@ class AppModuleUsagePass : public Pass {
  public:
   AppModuleUsagePass() : Pass("AppModuleUsagePass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("uses_app_module_annotation_descriptor",
          DexType::get_type("Lcom/facebook/redex/annotations/UsesAppModule;"),

diff --git a/opt/basic-block/BasicBlockProfile.h b/opt/basic-block/BasicBlockProfile.h
@@ -13,5 +13,11 @@ class BasicBlockProfilePass : public Pass {
  public:
   BasicBlockProfilePass() : Pass("BasicBlockProfilePass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 };
diff --git a/opt/branch-prefix-hoisting/BranchPrefixHoisting.h b/opt/branch-prefix-hoisting/BranchPrefixHoisting.h
@@ -30,7 +30,10 @@ class BranchPrefixHoistingPass : public Pass {
   redex_properties::PropertyInteractions get_property_interactions()
       const override {
     using namespace redex_properties::names;
-    return {{NoInitClassInstructions, {.preserves = true}}};
+    return {
+        {NoInitClassInstructions, {.preserves = true}},
+        {HasSourceBlocks, {.preserves = true}},
+    };
   }
 
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;

diff --git a/opt/builder_pattern/RemoveBuilderPattern.h b/opt/builder_pattern/RemoveBuilderPattern.h
@@ -16,6 +16,13 @@ namespace builder_pattern {
 class RemoveBuilderPatternPass : public Pass {
  public:
   RemoveBuilderPatternPass() : Pass("RemoveBuilderPatternPass") {}
+
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   explicit RemoveBuilderPatternPass(const std::string& name) : Pass(name) {}
 
   void bind_config() override;

diff --git a/opt/check-recursion/CheckRecursion.h b/opt/check-recursion/CheckRecursion.h
@@ -13,6 +13,12 @@ class CheckRecursionPass : public Pass {
  public:
   CheckRecursionPass() : Pass("CheckRecursionPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   int bad_recursion_count{4};
 
   void bind_config() override {

diff --git a/opt/check_breadcrumbs/CheckBreadcrumbs.h b/opt/check_breadcrumbs/CheckBreadcrumbs.h
@@ -30,7 +30,10 @@ class CheckBreadcrumbsPass : public Pass {
   redex_properties::PropertyInteractions get_property_interactions()
       const override {
     using namespace redex_properties::names;
-    return {{NoInitClassInstructions, {.preserves = true}}};
+    return {
+        {NoInitClassInstructions, {.preserves = true}},
+        {HasSourceBlocks, {.preserves = true}},
+    };
   }
 
   void bind_config() override {

diff --git a/opt/class-merging/AnonymousClassMergingPass.h b/opt/class-merging/AnonymousClassMergingPass.h
@@ -17,6 +17,12 @@ class AnonymousClassMergingPass : public Pass {
  public:
   AnonymousClassMergingPass() : Pass("AnonymousClassMergingPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override;
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 

diff --git a/opt/class-merging/ClassMergingPass.h b/opt/class-merging/ClassMergingPass.h
@@ -21,6 +21,13 @@ class ModelMerger;
 class ClassMergingPass : public Pass {
  public:
   ClassMergingPass() : Pass("ClassMergingPass") {}
+
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   explicit ClassMergingPass(const char* name) : Pass(name) {}
 
   void bind_config() override;

diff --git a/opt/class-merging/IntraDexClassMergingPass.h b/opt/class-merging/IntraDexClassMergingPass.h
@@ -24,6 +24,12 @@ class IntraDexClassMergingPass : public Pass {
  public:
   IntraDexClassMergingPass() : Pass("IntraDexClassMergingPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override;
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 

diff --git a/opt/class-splitting/ClassSplittingPass.h b/opt/class-splitting/ClassSplittingPass.h
@@ -16,6 +16,12 @@ class ClassSplittingPass : public Pass {
  public:
   ClassSplittingPass() : Pass("ClassSplittingPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.requires_ = true, .preserves = true}}};
+  }
+
   void bind_config() override {
     bind("enabled", m_config.enabled, m_config.enabled);
     bind("combine_target_classes_by_api_level",

diff --git a/opt/constant-propagation/ConstantPropagationPass.h b/opt/constant-propagation/ConstantPropagationPass.h
@@ -16,6 +16,12 @@ class ConstantPropagationPass : public Pass {
  public:
   ConstantPropagationPass() : Pass("ConstantPropagationPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("replace_moves_with_consts",
          true,

diff --git a/opt/constant-propagation/IPConstantPropagation.h b/opt/constant-propagation/IPConstantPropagation.h
@@ -41,6 +41,12 @@ class PassImpl : public Pass {
       : Pass("InterproceduralConstantPropagationPass"),
         m_config(std::move(config)) {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   PassImpl() : PassImpl(Config()) {}
 
   void bind_config() override {

diff --git a/opt/copy-propagation/CopyPropagationPass.h b/opt/copy-propagation/CopyPropagationPass.h
@@ -17,7 +17,10 @@ class CopyPropagationPass : public Pass {
   redex_properties::PropertyInteractions get_property_interactions()
       const override {
     using namespace redex_properties::names;
-    return {{NoInitClassInstructions, {.preserves = true}}};
+    return {
+        {NoInitClassInstructions, {.preserves = true}},
+        {HasSourceBlocks, {.preserves = true}},
+    };
   }
 
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;

diff --git a/opt/cse/CommonSubexpressionEliminationPass.h b/opt/cse/CommonSubexpressionEliminationPass.h
@@ -15,6 +15,12 @@ class CommonSubexpressionEliminationPass : public Pass {
   CommonSubexpressionEliminationPass()
       : Pass("CommonSubexpressionEliminationPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override;
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 

diff --git a/opt/dedup-strings/DedupStrings.h b/opt/dedup-strings/DedupStrings.h
@@ -172,6 +172,12 @@ class DedupStringsPass : public Pass {
  public:
   DedupStringsPass() : Pass("DedupStringsPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.requires_ = true, .preserves = true}}};
+  }
+
   void bind_config() override;
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
   bool is_editable_cfg_friendly() override { return true; }

diff --git a/opt/dedup_blocks/DedupBlocksPass.h b/opt/dedup_blocks/DedupBlocksPass.h
@@ -17,7 +17,10 @@ class DedupBlocksPass : public Pass {
   redex_properties::PropertyInteractions get_property_interactions()
       const override {
     using namespace redex_properties::names;
-    return {{NoInitClassInstructions, {.preserves = true}}};
+    return {
+        {NoInitClassInstructions, {.preserves = true}},
+        {HasSourceBlocks, {.preserves = true}},
+    };
   }
 
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;

diff --git a/opt/dedup_resources/DedupResources.h b/opt/dedup_resources/DedupResources.h
@@ -51,6 +51,12 @@ class DedupResourcesPass : public Pass {
  public:
   DedupResourcesPass() : Pass("DedupResourcesPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("disallowed_types", {}, m_disallowed_types);
     bind("disallowed_resources", {}, m_disallowed_resources);

diff --git a/opt/delinit/DelInit.h b/opt/delinit/DelInit.h
@@ -13,6 +13,12 @@ class DelInitPass : public Pass {
  public:
   DelInitPass() : Pass("DelInitPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("package_allowlist", {}, m_package_filter);
   }

diff --git a/opt/delsuper/DelSuper.h b/opt/delsuper/DelSuper.h
@@ -14,5 +14,11 @@ class DelSuperPass : public Pass {
  public:
   DelSuperPass() : Pass("DelSuperPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 };
diff --git a/opt/evaluate_type_checks/EvaluateTypeChecks.h b/opt/evaluate_type_checks/EvaluateTypeChecks.h
@@ -22,6 +22,12 @@ class EvaluateTypeChecksPass : public Pass {
  public:
   EvaluateTypeChecksPass() : Pass("EvaluateTypeChecksPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 
   // Exposed for testing.

diff --git a/opt/final_inline/FinalInline.h b/opt/final_inline/FinalInline.h
@@ -27,6 +27,12 @@ class FinalInlinePass : public Pass {
  public:
   FinalInlinePass() : Pass("FinalInlinePass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("blocklist_annos",
          {},

diff --git a/opt/final_inline/FinalInlineV2.h b/opt/final_inline/FinalInlineV2.h
@@ -27,6 +27,12 @@ class FinalInlinePassV2 : public Pass {
 
   FinalInlinePassV2() : Pass("FinalInlinePassV2") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.preserves = true}}};
+  }
+
   void bind_config() override {
     bind("inline_instance_field", true, m_config.inline_instance_field);
     bind("blocklist_types",

diff --git a/opt/init-classes/InitClassLoweringPass.h b/opt/init-classes/InitClassLoweringPass.h
@@ -17,7 +17,10 @@ class InitClassLoweringPass : public Pass {
   redex_properties::PropertyInteractions get_property_interactions()
       const override {
     using namespace redex_properties::names;
-    return {{NoInitClassInstructions, {.establishes = true}}};
+    return {
+        {NoInitClassInstructions, {.establishes = true}},
+        {HasSourceBlocks, {.preserves = true}},
+    };
   }
 
   void bind_config() override;

diff --git a/opt/insert-source-blocks/InsertSourceBlocks.h b/opt/insert-source-blocks/InsertSourceBlocks.h
@@ -22,6 +22,12 @@ class InsertSourceBlocksPass : public Pass {
  public:
   InsertSourceBlocksPass() : Pass("InsertSourceBlocksPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.establishes = true}}};
+  }
+
   void bind_config() override;
   void run_pass(DexStoresVector&, ConfigFiles&, PassManager&) override;
 

diff --git a/opt/instrument/Instrument.h b/opt/instrument/Instrument.h
@@ -31,6 +31,12 @@ class InstrumentPass : public Pass {
  public:
   InstrumentPass() : Pass("InstrumentPass") {}
 
+  redex_properties::PropertyInteractions get_property_interactions()
+      const override {
+    using namespace redex_properties::names;
+    return {{HasSourceBlocks, {.requires_ = true, .preserves = false}}};
+  }
+
   void bind_config() override;
   void eval_pass(DexStoresVector& stores,
                  ConfigFiles& conf,