commit 800ac2defde5d12b2f1f313c6b6162560cfa6fc7
author Hiroshi Yamauchi <yamauchi@google.com> Wed Apr 02 17:32:54 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Apr 03 20:16:44 2014 -0700
tree c25e10b68be9be9949e96d3c977fbcf906f22a3a
parent 5cff3083c00dfbae7b8c5c34b0bedbc514c91df9

Insert an empty read barrier call.

Bug: 12687968
Change-Id: Ie1d28658e16e09f6a983cb5c1f0d5b375b7ae069

runtime/mirror/object.h

diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index 1ac23ce..f652202 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -185,7 +185,7 @@
   bool IsPhantomReferenceInstance() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   // Accessor for Java type fields.
-  template<class T, VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
+  template<class T, VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, bool kDoReadBarrier = true>
   T* GetFieldObject(MemberOffset field_offset, bool is_volatile)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   template<bool kTransactionActive, bool kCheckTransaction = true,