diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-04-29 07:25:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-29 07:25:00 +0000 |
| commit | deeb21bbe114193477755074a1e31595abafd5c2 (patch) | |
| tree | 631e3ec8591392057b4bf831e28487b39f8e0d20 /runtime/entrypoints | |
| parent | cb905718826da268d8d8e09296806256f202c9f4 (diff) | |
| parent | 714f175bd66d03225927a84f3d5dbc923c5a3e7e (diff) | |
| download | art-deeb21bbe114193477755074a1e31595abafd5c2.zip art-deeb21bbe114193477755074a1e31595abafd5c2.tar.gz art-deeb21bbe114193477755074a1e31595abafd5c2.tar.bz2 | |
Merge "Visit deoptimized shadow frames as roots"
Diffstat (limited to 'runtime/entrypoints')
| -rw-r--r-- | runtime/entrypoints/portable/portable_thread_entrypoints.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/portable/portable_thread_entrypoints.cc b/runtime/entrypoints/portable/portable_thread_entrypoints.cc index 4f19964..9e62e0e 100644 --- a/runtime/entrypoints/portable/portable_thread_entrypoints.cc +++ b/runtime/entrypoints/portable/portable_thread_entrypoints.cc @@ -78,7 +78,7 @@ extern "C" void art_portable_test_suspend_from_code(Thread* self) visitor.WalkStack(true); self->SetDeoptimizationShadowFrame(visitor.GetShadowFrameCopy()); self->SetDeoptimizationReturnValue(JValue()); - self->SetException(ThrowLocation(), reinterpret_cast<mirror::Throwable*>(-1)); + self->SetException(ThrowLocation(), Thread::GetDeoptimizationException()); } } |