diff options
Diffstat (limited to 'runtime/runtime_intrinsics.cc')
| -rw-r--r-- | runtime/runtime_intrinsics.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/runtime_intrinsics.cc b/runtime/runtime_intrinsics.cc index 1672c49a9b..fb60cfe393 100644 --- a/runtime/runtime_intrinsics.cc +++ b/runtime/runtime_intrinsics.cc @@ -90,10 +90,10 @@ bool IsIntrinsicInitialized(Thread* self, } } -bool AreAllIntrinsicsInitialized() { - ScopedObjectAccess soa(Thread::Current()); +bool AreAllIntrinsicsInitialized() REQUIRES_SHARED(Locks::mutator_lock_) { + Thread* self = Thread::Current(); #define IS_INTRINSIC_INITIALIZED(Name, InvokeType, _, __, ___, ClassName, MethodName, Signature) \ - IsIntrinsicInitialized(soa.Self(), \ + IsIntrinsicInitialized(self, \ Intrinsics::k##Name, \ InvokeType, \ ClassName, \ @@ -107,11 +107,11 @@ bool AreAllIntrinsicsInitialized() { } // namespace void InitializeIntrinsics() { - ScopedObjectAccess soa(Thread::Current()); + Thread* self = Thread::Current(); // Initialization here uses the short-circuit operator || to stop // initializing if there's an already initialized intrinsic. #define INITIALIZE_INTRINSIC(Name, InvokeType, _, __, ___, ClassName, MethodName, Signature) \ - InitializeIntrinsic(soa.Self(), \ + InitializeIntrinsic(self, \ Intrinsics::k##Name, \ InvokeType, \ ClassName, \ |