exclude throw in may_throw

Summary: There are is_throw and can_throw method Reviewed By: NTillmann Differential Revision: D62260532 fbshipit-source-id: 28649dfa0cdaff8169585aacf3e19c4a29aeb30a
facebook · Sep 5, 2024 · 6bcd361 · 6bcd361
1 parent 1f2e35d
commit 6bcd361
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libredex/IROpcode.cpp b/libredex/IROpcode.cpp
@@ -884,7 +884,6 @@ bool may_throw(IROpcode op) {
   case OPCODE_NEW_ARRAY:
   case OPCODE_FILLED_NEW_ARRAY:
   case OPCODE_FILL_ARRAY_DATA:
-  case OPCODE_THROW:
   case OPCODE_AGET:
   case OPCODE_AGET_WIDE:
   case OPCODE_AGET_OBJECT:

diff --git a/libredex/IROpcode.h b/libredex/IROpcode.h
@@ -94,6 +94,7 @@ bool is_binop64(IROpcode op);
 /**
  * Update according to
  * https://cs.android.com/android/platform/superproject/main/+/main:art/libdexfile/dex/dex_instruction_list.h
+ * except OPCODE_THROW, this get covered in can_throw
  */
 bool may_throw(IROpcode);
 
@@ -113,6 +114,10 @@ bool may_throw(IROpcode);
   inline bool is_##LC(IROpcode op) { return op == IOPCODE_##UC; }
 #include "IROpcodes.def"
 
+/**
+ * Should represent value in
+ * https://cs.android.com/android/platform/superproject/main/+/main:art/libdexfile/dex/dex_instruction_list.h
+ */
 inline bool can_throw(IROpcode op) { return may_throw(op) || is_throw(op); }
 
 inline bool writes_result_register(IROpcode op) {