3 files changed, 5 insertions, 14 deletions
diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h
index 4afb78a0e2..2ca286ea6a 100644
--- a/compiler/optimizing/inliner.h
+++ b/compiler/optimizing/inliner.h
@@ -246,8 +246,7 @@ class HInliner : public HOptimization {
                    HInstruction* cursor,
                    HBasicBlock* bb_cursor);
 
-  HInstanceFieldGet* BuildGetReceiverClass(HInstruction* receiver,
-                                           uint32_t dex_pc) const
+  HInstanceFieldGet* BuildGetReceiverClass(HInstruction* receiver, uint32_t dex_pc) const
     REQUIRES_SHARED(Locks::mutator_lock_);
 
   void MaybeRunReferenceTypePropagation(HInstruction* replacement,
diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index 713806e217..5323ae2445 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -172,15 +172,11 @@ IntrinsicVisitor::ValueOfInfo IntrinsicVisitor::ComputeValueOfInfo(
 }
 
 MemberOffset IntrinsicVisitor::GetReferenceDisableIntrinsicOffset() {
-  ScopedObjectAccess soa(Thread::Current());
-  ArtField* field = WellKnownClasses::java_lang_ref_Reference_disableIntrinsic;
-  return field->GetOffset();
+  return WellKnownClasses::java_lang_ref_Reference_disableIntrinsic->GetOffset();
 }
 
 MemberOffset IntrinsicVisitor::GetReferenceSlowPathEnabledOffset() {
-  ScopedObjectAccess soa(Thread::Current());
-  ArtField* field = WellKnownClasses::java_lang_ref_Reference_slowPathEnabled;
-  return field->GetOffset();
+  return WellKnownClasses::java_lang_ref_Reference_slowPathEnabled->GetOffset();
 }
 
 void IntrinsicVisitor::CreateReferenceGetReferentLocations(HInvoke* invoke,
diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc
index 3e90a0881f..32b4557de0 100644
--- a/compiler/optimizing/reference_type_propagation.cc
+++ b/compiler/optimizing/reference_type_propagation.cc
@@ -276,12 +276,8 @@ static void BoundTypeForClassCheck(HInstruction* check) {
     return;
   }
 
-  {
-    ScopedObjectAccess soa(Thread::Current());
-    ArtField* field = WellKnownClasses::java_lang_Object_shadowKlass;
-    if (field_get->GetFieldInfo().GetField() != field) {
-      return;
-    }
+  if (field_get->GetFieldInfo().GetField() != WellKnownClasses::java_lang_Object_shadowKlass) {
+    return;
   }
 
   if (check->IsIf()) {