1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index a6cf10c264..bd654bb73b 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -131,7 +131,12 @@ class ClassLinkerTest : public CommonRuntimeTest {
     EXPECT_TRUE(JavaLangObject->GetSuperClass() == nullptr);
     EXPECT_FALSE(JavaLangObject->HasSuperClass());
     EXPECT_TRUE(JavaLangObject->GetClassLoader() == nullptr);
-    class_linker_->MakeInitializedClassesVisiblyInitialized(Thread::Current(), /*wait=*/ true);
+    // TODO(b/253691761): Remove the last argument to MakeInitializedClassesVisiblyInitial when
+    // possible. We should not be holding the mutator lock here, but temporarily releasing it
+    // would compromise the ObjPtr argument.
+    class_linker_->MakeInitializedClassesVisiblyInitialized(Thread::Current(),
+                                                            /*wait=*/ true,
+                                                            /*allowLockChecking=*/ false);
     EXPECT_EQ(ClassStatus::kVisiblyInitialized, JavaLangObject->GetStatus());
     EXPECT_FALSE(JavaLangObject->IsErroneous());
     EXPECT_TRUE(JavaLangObject->IsLoaded());