Revert^2 "JNI: Rewrite locking for synchronized methods."
This reverts commit 02e0eb7eef35b03ae9eed60f02c889a6be400de9.
Reason for revert: Fixed the arm64 UNLOCK_OBJECT_FAST_PATH
macro to use the correct label for one branch to slow path.
Change-Id: I311687e877c54229af1613db2928e47b3ef0b6f2
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 172332525
diff --git a/runtime/entrypoints/quick/quick_default_externs.h b/runtime/entrypoints/quick/quick_default_externs.h
index 6ecf3fd..f43e25f 100644
--- a/runtime/entrypoints/quick/quick_default_externs.h
+++ b/runtime/entrypoints/quick/quick_default_externs.h
@@ -114,9 +114,13 @@
extern "C" void art_quick_invoke_virtual_trampoline_with_access_check(uint32_t, void*);
-// JNI read barrier entrypoint.
+// JNI read barrier entrypoint. Note: Preserves all registers.
extern "C" void art_read_barrier_jni(art::ArtMethod* method);
+// JNI lock/unlock entrypoints. Note: Custom calling convention.
+extern "C" void art_quick_lock_object_jni(art::mirror::Object*);
+extern "C" void art_quick_unlock_object_jni(art::mirror::Object*);
+
// Polymorphic invoke entrypoints.
extern "C" void art_quick_invoke_polymorphic(uint32_t, void*);
extern "C" void art_quick_invoke_custom(uint32_t, void*);