diff options
| author | Mingyao Yang <mingyao@google.com> | 2015-06-18 21:21:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-18 21:21:40 +0000 |
| commit | 23b4feebd1f6fc7415f3eec49391a7d035adc8d5 (patch) | |
| tree | c659b33f0057cb0cc3e934f3d0c8fa6f84887910 /runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc | |
| parent | 26d53e38ec9a87e51722750d2af4095bdf962e4d (diff) | |
| parent | ef484d442a3dcae2cd1842c5be0623f5cf71e4ab (diff) | |
| download | art-23b4feebd1f6fc7415f3eec49391a7d035adc8d5.tar.gz art-23b4feebd1f6fc7415f3eec49391a7d035adc8d5.tar.bz2 art-23b4feebd1f6fc7415f3eec49391a7d035adc8d5.zip | |
am ef484d44: Fix nested deoptimization.
* commit 'ef484d442a3dcae2cd1842c5be0623f5cf71e4ab':
Fix nested deoptimization.
Diffstat (limited to 'runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc')
| -rw-r--r-- | runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc index 3eefeef84a..9860fb057e 100644 --- a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc @@ -28,6 +28,7 @@ namespace art { extern "C" NO_RETURN void artDeoptimize(Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { ScopedQuickEntrypointChecks sqec(self); + self->PushAndClearDeoptimizationReturnValue(); self->SetException(Thread::GetDeoptimizationException()); self->QuickDeliverException(); } |