From 89cbeb65ed1fe8bca331efc5d3c52d1db62aeffc Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Tue, 9 Apr 2019 10:51:05 +0100
Subject: Fix AssertNonMovableStringClass().

Use standard thread state transition.

Test: testrunner.py --host --jit --gcstress -t 157
Bug: 126246773
Change-Id: I496ede614508f9c84692c4fa549153025c6ef9b4
---
 compiler/optimizing/intrinsics.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/optimizing/intrinsics.cc')

diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index 2de0f0c737..d9401050df 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -365,8 +365,7 @@ IntrinsicVisitor::IntegerValueOfInfo IntrinsicVisitor::ComputeIntegerValueOfInfo
 
 void IntrinsicVisitor::AssertNonMovableStringClass() {
   if (kIsDebugBuild) {
-    Thread* const self = Thread::Current();
-    ReaderMutexLock mu(self, *Locks::mutator_lock_);
+    ScopedObjectAccess soa(Thread::Current());
     ObjPtr<mirror::Class> string_class = GetClassRoot<art::mirror::String>();
     CHECK(!art::Runtime::Current()->GetHeap()->IsMovableObject(string_class));
   }
-- 
cgit v1.2.3-59-g8ed1b