diff options
author | Mingyao Yang <mingyao@google.com> | 2015-04-01 14:03:04 -0700 |
---|---|---|
committer | Mingyao Yang <mingyao@google.com> | 2015-04-01 14:05:13 -0700 |
commit | d43b3ac88cd46b8815890188c9c2b9a3f1564648 (patch) | |
tree | 6c599c3f40d57e92786bd7f41c0541d9eaa2643b /runtime/entrypoints | |
parent | a109632b240f3c9355ca95500f6f48e4478e3c51 (diff) | |
download | art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.zip art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.tar.gz art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.tar.bz2 |
Revert "Revert "Deoptimization-based bce.""
This reverts commit 0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430.
Change-Id: I1ca10d15bbb49897a0cf541ab160431ec180a006
Diffstat (limited to 'runtime/entrypoints')
-rw-r--r-- | runtime/entrypoints/quick/quick_entrypoints_list.h | 1 | ||||
-rw-r--r-- | runtime/entrypoints/runtime_asm_entrypoints.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_entrypoints_list.h b/runtime/entrypoints/quick/quick_entrypoints_list.h index da454f3..eaf874e 100644 --- a/runtime/entrypoints/quick/quick_entrypoints_list.h +++ b/runtime/entrypoints/quick/quick_entrypoints_list.h @@ -120,6 +120,7 @@ V(ThrowNoSuchMethod, void, int32_t) \ V(ThrowNullPointer, void, void) \ V(ThrowStackOverflow, void, void*) \ + V(Deoptimize, void, void) \ \ V(A64Load, int64_t, volatile const int64_t *) \ V(A64Store, void, volatile int64_t *, int64_t) diff --git a/runtime/entrypoints/runtime_asm_entrypoints.h b/runtime/entrypoints/runtime_asm_entrypoints.h index 420e8db..bfe7ee8 100644 --- a/runtime/entrypoints/runtime_asm_entrypoints.h +++ b/runtime/entrypoints/runtime_asm_entrypoints.h @@ -70,6 +70,8 @@ static inline const void* GetQuickInstrumentationEntryPoint() { return reinterpret_cast<const void*>(art_quick_instrumentation_entry); } +extern "C" void art_quick_deoptimize_from_compiled_slow_path(); + // The return_pc of instrumentation exit stub. extern "C" void art_quick_instrumentation_exit(); static inline const void* GetQuickInstrumentationExitPc() { |