diff options
| author | 2020-03-13 13:55:44 -0700 | |
|---|---|---|
| committer | 2020-03-16 14:27:14 +0000 | |
| commit | e8ed866d391291e80f5d267cce1b5f913dcfc0fe (patch) | |
| tree | ff0a5eb60e729089da76b167c152eff23c7e9d80 | |
| parent | edccd3cc6d0b60bcf87295774b0728fd8755c329 (diff) | |
Add MOVE_EXCEPTION to compat throw
In some apps, move-exception soft fail and be handled like a throw.
Add it to compat throw to avoid verifier aborts.
Bug: 146178710
Test: make
Change-Id: I9068260044fda4508314dab49bfee5215a2d96b0
| -rw-r--r-- | runtime/verifier/method_verifier.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index 742f50dec8..740fd09c63 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -129,7 +129,7 @@ enum class FieldAccessType { // // Note: This should eventually be removed. constexpr bool IsCompatThrow(Instruction::Code opcode) { - return opcode == Instruction::Code::RETURN_OBJECT; + return opcode == Instruction::Code::RETURN_OBJECT || opcode == Instruction::Code::MOVE_EXCEPTION; } template <bool kVerifierDebug> |