1 files changed, 10 insertions, 25 deletions

diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index dc5304ccf0..e3d0abb7d3 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -411,24 +411,20 @@ class JniCompilerTest : public CommonCompilerTest {
     }
   };
 
-  static uint32_t JniMethodStartSynchronizedOverride(jobject to_lock, Thread* self);
-  static void JniMethodEndSynchronizedOverride(uint32_t saved_local_ref_cookie,
-                                               jobject locked,
-                                               Thread* self);
+  static void JniMethodStartSynchronizedOverride(jobject to_lock, Thread* self);
+  static void JniMethodEndSynchronizedOverride(jobject locked, Thread* self);
   static mirror::Object* JniMethodEndWithReferenceSynchronizedOverride(
       jobject result,
-      uint32_t saved_local_ref_cookie,
       jobject locked,
       Thread* self);
 
-  using StartSynchronizedType = uint32_t (*)(jobject, Thread*);
-  using EndSynchronizedType = void (*)(uint32_t, jobject, Thread*);
-  using EndWithReferenceSynchronizedType = mirror::Object* (*)(jobject, uint32_t, jobject, Thread*);
+  using StartSynchronizedType = void (*)(jobject, Thread*);
+  using EndSynchronizedType = void (*)(jobject, Thread*);
+  using EndWithReferenceSynchronizedType = mirror::Object* (*)(jobject, jobject, Thread*);
 
   static StartSynchronizedType jni_method_start_synchronized_original_;
   static EndSynchronizedType jni_method_end_synchronized_original_;
   static EndWithReferenceSynchronizedType jni_method_end_with_reference_synchronized_original_;
-  static uint32_t saved_local_ref_cookie_;
   static jobject locked_object_;
 
   bool check_generic_jni_;
@@ -441,35 +437,24 @@ JniCompilerTest::StartSynchronizedType JniCompilerTest::jni_method_start_synchro
 JniCompilerTest::EndSynchronizedType JniCompilerTest::jni_method_end_synchronized_original_;
 JniCompilerTest::EndWithReferenceSynchronizedType
     JniCompilerTest::jni_method_end_with_reference_synchronized_original_;
-uint32_t JniCompilerTest::saved_local_ref_cookie_;
 jobject JniCompilerTest::locked_object_;
 
-uint32_t JniCompilerTest::JniMethodStartSynchronizedOverride(jobject to_lock, Thread* self) {
+void JniCompilerTest::JniMethodStartSynchronizedOverride(jobject to_lock, Thread* self) {
   locked_object_ = to_lock;
-  uint32_t cookie = jni_method_start_synchronized_original_(to_lock, self);
-  saved_local_ref_cookie_ = cookie;
-  return cookie;
+  jni_method_start_synchronized_original_(to_lock, self);
 }
 
-void JniCompilerTest::JniMethodEndSynchronizedOverride(uint32_t saved_local_ref_cookie,
-                                                       jobject locked,
-                                                       Thread* self) {
-  EXPECT_EQ(saved_local_ref_cookie_, saved_local_ref_cookie);
+void JniCompilerTest::JniMethodEndSynchronizedOverride(jobject locked, Thread* self) {
   EXPECT_EQ(locked_object_, locked);
-  jni_method_end_synchronized_original_(saved_local_ref_cookie, locked, self);
+  jni_method_end_synchronized_original_(locked, self);
 }
 
 mirror::Object* JniCompilerTest::JniMethodEndWithReferenceSynchronizedOverride(
     jobject result,
-    uint32_t saved_local_ref_cookie,
     jobject locked,
     Thread* self) {
-  EXPECT_EQ(saved_local_ref_cookie_, saved_local_ref_cookie);
   EXPECT_EQ(locked_object_, locked);
-  return jni_method_end_with_reference_synchronized_original_(result,
-                                                              saved_local_ref_cookie,
-                                                              locked,
-                                                              self);
+  return jni_method_end_with_reference_synchronized_original_(result, locked, self);
 }
 
 // Test the normal compiler and normal generic JNI only.