diff options
| author | Jeff Hao <jeffhao@google.com> | 2014-07-24 16:26:09 -0700 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2014-07-28 18:33:04 -0700 |
| commit | 0398e171f206cd3b140a358ac31b0a3760380df1 (patch) | |
| tree | db5b34142d812f95581a864b681940efc94c6945 /runtime/entrypoints/quick | |
| parent | e5647289ccc7dafd8b91771a7bd1cd19416aed66 (diff) | |
| download | art-0398e171f206cd3b140a358ac31b0a3760380df1.zip art-0398e171f206cd3b140a358ac31b0a3760380df1.tar.gz art-0398e171f206cd3b140a358ac31b0a3760380df1.tar.bz2 | |
Fix proxy tracing and enable tests that now work with tracing.
Bug: 16386215
Change-Id: Iec2a372c921caceb050c6baf72d48b3d822899a4
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 338bd06..8bc3707 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -586,8 +586,7 @@ extern "C" uint64_t artQuickProxyInvokeHandler(mirror::ArtMethod* proxy_method, const char* old_cause = self->StartAssertNoThreadSuspension("Adding to IRT proxy object arguments"); // Register the top of the managed stack, making stack crawlable. - DCHECK_EQ(sp->AsMirrorPtr(), proxy_method) - << PrettyMethod(proxy_method); + DCHECK_EQ(sp->AsMirrorPtr(), proxy_method) << PrettyMethod(proxy_method); self->SetTopOfStack(sp, 0); DCHECK_EQ(proxy_method->GetFrameSizeInBytes(), Runtime::Current()->GetCalleeSaveMethod(Runtime::kRefsAndArgs)->GetFrameSizeInBytes()) |