diff options
| author | 2016-10-20 14:41:18 +0000 | |
|---|---|---|
| committer | 2016-10-20 14:41:18 +0000 | |
| commit | 024662a3102df92fabf4f40d9ec40976f8e20c5d (patch) | |
| tree | 248a072ebfa8e3a7897ad08f819456f28e47c0bc /runtime/entrypoints/quick/quick_entrypoints.h | |
| parent | 4a4ff643b629b268787fb97648116e1ac391f53b (diff) | |
| parent | af1e2990cd1406a0fb7cba1d2e208208e950e413 (diff) | |
Merge changes I16f8b7ec,I075bbf55
* changes:
jni: Support @FastNative methods that return objects
Revert "jni: Disable FastNative path for methods returning objects"
Diffstat (limited to 'runtime/entrypoints/quick/quick_entrypoints.h')
| -rw-r--r-- | runtime/entrypoints/quick/quick_entrypoints.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h index 89712a3cc7..915f18ed71 100644 --- a/runtime/entrypoints/quick/quick_entrypoints.h +++ b/runtime/entrypoints/quick/quick_entrypoints.h @@ -65,6 +65,11 @@ extern void JniMethodEndSynchronized(uint32_t saved_local_ref_cookie, jobject lo extern mirror::Object* JniMethodEndWithReference(jobject result, uint32_t saved_local_ref_cookie, Thread* self) NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; +extern mirror::Object* JniMethodFastEndWithReference(jobject result, + uint32_t saved_local_ref_cookie, + Thread* self) + NO_THREAD_SAFETY_ANALYSIS HOT_ATTR; + extern mirror::Object* JniMethodEndWithReferenceSynchronized(jobject result, uint32_t saved_local_ref_cookie, |