diff options
author | 2021-10-19 16:19:34 +0000 | |
---|---|---|
committer | 2021-10-19 16:23:58 +0000 | |
commit | 2ca0900e98d826644960eefeb8a21c84850c9e04 (patch) | |
tree | ba8a25622f6bee25817be41880ea01c345d9a2b1 /runtime/entrypoints/quick/quick_entrypoints.h | |
parent | 44101a388089b4e23b284e1794eb475938a2f7ed (diff) |
Revert "JNI: Remove `JniMethodFast{Start,End}()`."
This reverts commit 64d6e187f19ed670429652020561887e6b220216.
Reason for revert: Breaks no-image JIT run tests (flaky).
Bug: 172332525
Change-Id: I7813d89283eff0f6266318d3fb02d1257471798d
Diffstat (limited to 'runtime/entrypoints/quick/quick_entrypoints.h')
-rw-r--r-- | runtime/entrypoints/quick/quick_entrypoints.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h index 6076ec671e..3f7c2302f2 100644 --- a/runtime/entrypoints/quick/quick_entrypoints.h +++ b/runtime/entrypoints/quick/quick_entrypoints.h @@ -55,20 +55,23 @@ struct PACKED(4) QuickEntryPoints { // JNI entrypoints. // TODO: NO_THREAD_SAFETY_ANALYSIS due to different control paths depending on fast JNI. extern void JniMethodStart(Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; +extern void JniMethodFastStart(Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; extern void JniMethodStartSynchronized(jobject to_lock, Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; extern void JniMethodEnd(Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; +extern void JniMethodFastEnd(Thread* self) + NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; extern void JniMethodEndSynchronized(jobject locked, Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; extern mirror::Object* JniMethodEndWithReference(jobject result, Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; +extern mirror::Object* JniMethodFastEndWithReference(jobject result, Thread* self) + NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; extern mirror::Object* JniMethodEndWithReferenceSynchronized(jobject result, jobject locked, Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; -extern mirror::Object* JniDecodeReferenceResult(jobject result, Thread* self) - NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; // JNI entrypoints when monitoring entry/exit. extern void JniMonitoredMethodStart(Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; |