From 02e0eb7eef35b03ae9eed60f02c889a6be400de9 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 23 Nov 2021 11:57:23 +0000 Subject: Revert "JNI: Rewrite locking for synchronized methods." This reverts commit c17656bcf477e57d59ff051037c96994fd0ac8f2. Reason for revert: Broke tests. At least the arm64 macro UNLOCK_OBJECT_FAST_PATH uses an incorrect label for one branch to slow path. Bug: 172332525 Bug: 207408813 Change-Id: I6764dcfcba3b3d780fc13a66d6e676a3e3946a0f --- runtime/entrypoints/entrypoint_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/entrypoints/entrypoint_utils.h') diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 4731a867d2..72b4c030f8 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -217,7 +217,7 @@ bool NeedsClinitCheckBeforeCall(ArtMethod* method) REQUIRES_SHARED(Locks::mutato // Returns the synchronization object for a native method for a GenericJni frame // we have just created or are about to exit. The synchronization object is // the class object for static methods and the `this` object otherwise. -ObjPtr GetGenericJniSynchronizationObject(Thread* self, ArtMethod* called) +jobject GetGenericJniSynchronizationObject(Thread* self, ArtMethod* called) REQUIRES_SHARED(Locks::mutator_lock_); // Update .bss method entrypoint if the `callee_reference` has an associated oat file -- cgit v1.2.3-59-g8ed1b