Introduce AddCheckCastPass

Summary: Install time class verification could fail because of missing classes from the base apk. This particular case is when types voltron modules are being implicitly casted and returned in a method. Reviewed By: NTillmann Differential Revision: D50173116 fbshipit-source-id: 93e45ce419027a6920f997ccfbda27d2367fe62b
facebook · Nov 7, 2023 · adc8dc3 · adc8dc3
1 parent ce0d45c
commit adc8dc3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/libredex/ControlFlow.cpp b/libredex/ControlFlow.cpp
@@ -3350,3 +3350,16 @@ std::size_t ControlFlowGraph::opcode_hash() const {
 }
 
 } // namespace cfg
+
+std::unordered_map<const IRInstruction*, ParamIndex> get_load_param_map(
+    const cfg::ControlFlowGraph& cfg) {
+  std::unordered_map<const IRInstruction*, ParamIndex> map;
+  const auto param_insns = InstructionIterable(cfg.get_param_instructions());
+  ParamIndex index = 0;
+  for (auto it = param_insns.begin(); it != param_insns.end(); it++) {
+    const auto insn = it->insn;
+    always_assert(opcode::is_a_load_param(insn->opcode()));
+    map.insert({insn, index++});
+  }
+  return map;
+}
diff --git a/libredex/ControlFlow.h b/libredex/ControlFlow.h
@@ -65,6 +65,17 @@
  */
 
 extern std::atomic<size_t> build_cfg_counter;
+/*
+ * An index into the list of load-param instructions.
+ */
+using ParamIndex = uint32_t;
+
+/*
+ * A helper function that computes the mapping of load param instructions
+ * to their respective indices.
+ */
+std::unordered_map<const IRInstruction*, ParamIndex> get_load_param_map(
+    const cfg::ControlFlowGraph& cfg);
 
 namespace source_blocks {
 namespace impl {

diff --git a/libredex/Trace.h b/libredex/Trace.h
@@ -172,6 +172,7 @@ class DexType;
   TM(KOTLIN_INSTANCE)   \
   TM(KOTLIN_STATS)      \
   TM(KOTLIN_OBJ_INLINE) \
+  TM(ACC)               \
   /* End of list */
 
 enum TraceModule : int {

diff --git a/opt/result-propagation/ResultPropagation.cpp b/opt/result-propagation/ResultPropagation.cpp
@@ -233,19 +233,6 @@ class Analyzer final : public BaseIRAnalyzer<ParamDomainEnvironment> {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-std::unordered_map<const IRInstruction*, ParamIndex> get_load_param_map(
-    const cfg::ControlFlowGraph& cfg) {
-  std::unordered_map<const IRInstruction*, ParamIndex> map;
-  const auto param_insns = InstructionIterable(cfg.get_param_instructions());
-  ParamIndex index = 0;
-  for (auto it = param_insns.begin(); it != param_insns.end(); it++) {
-    const auto insn = it->insn;
-    always_assert(opcode::is_a_load_param(insn->opcode()));
-    map.insert({insn, index++});
-  }
-  return map;
-}
-
 boost::optional<ParamIndex> ReturnParamResolver::get_return_param_index(
     const IRInstruction* insn,
     const std::unordered_map<const DexMethod*, ParamIndex>&

diff --git a/opt/result-propagation/ResultPropagation.h b/opt/result-propagation/ResultPropagation.h
@@ -15,18 +15,6 @@ namespace cfg {
 class ControlFlowGraph;
 } // namespace cfg
 
-/*
- * An index into the list of load-param instructions.
- */
-using ParamIndex = uint32_t;
-
-/*
- * A helper function that computes the mapping of load param instructions
- * to their respective indices.
- */
-std::unordered_map<const IRInstruction*, ParamIndex> get_load_param_map(
-    const cfg::ControlFlowGraph& cfg);
-
 /*
  * A helper class for figuring out whether the regular return value of
  * methods and invocations is always a particular incoming parameter.