diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-29 08:33:44 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-07-29 08:33:44 +0000 |
| commit | 167cc7c33f7100e3f7acc1594c066daa0122e27a (patch) | |
| tree | d265344c32c5bf37d356fcb4871f57a1250d16b6 /runtime/entrypoints/quick | |
| parent | 0398e171f206cd3b140a358ac31b0a3760380df1 (diff) | |
| download | art-167cc7c33f7100e3f7acc1594c066daa0122e27a.zip art-167cc7c33f7100e3f7acc1594c066daa0122e27a.tar.gz art-167cc7c33f7100e3f7acc1594c066daa0122e27a.tar.bz2 | |
Revert "Fix proxy tracing and enable tests that now work with tracing."
This reverts commit 0398e171f206cd3b140a358ac31b0a3760380df1.
Change-Id: I1346ab01485cc7207be0ecb4d8788c500c0df903
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 8bc3707..338bd06 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -586,7 +586,8 @@ 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()) |