| commit | 6bcd163d322b867578fbcfe60e4e3b247c42974b | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Oct 08 18:50:47 2013 -0700 |
| committer | Ian Rogers <irogers@google.com> | Tue Oct 08 18:50:47 2013 -0700 |
| tree | 50ca85d5de030970aaced699fada2558d7f8593f | |
| parent | e73fadc7fd4082bbaed8b985dd86a794c7189f29 [diff] [blame] |
Fix exception throwing in monitor-enter for MIPS. Need to deliver pending exception. Change-Id: I1bceb1b0d866acc7b3190e7c661993ad43fc1769
diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S index e9c6698..7780bb3 100644 --- a/runtime/arch/mips/quick_entrypoints_mips.S +++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -489,7 +489,7 @@ move $a1, rSELF # pass Thread::Current jal artLockObjectFromCode # (Object* obj, Thread*, $sp) move $a2, $sp # pass $sp - RESTORE_REF_ONLY_CALLEE_SAVE_FRAME_AND_RETURN + RETURN_IF_ZERO END art_quick_lock_object /*