diff options
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 4 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index e0f9e5f958..9a274f618a 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -234,9 +234,9 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_EXCEPTION) { - Throwable* exception = self->GetException(NULL); - self->ClearException(); + Throwable* exception = self->GetException(nullptr); shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), exception); + self->ClearException(); ADVANCE(1); } HANDLE_INSTRUCTION_END(); diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index c1d24f5a5f..deb897a14a 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -163,9 +163,9 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem break; case Instruction::MOVE_EXCEPTION: { PREAMBLE(); - Throwable* exception = self->GetException(NULL); - self->ClearException(); + Throwable* exception = self->GetException(nullptr); shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), exception); + self->ClearException(); inst = inst->Next_1xx(); break; } |