commit 60bc39c8eb0e5d7328bf59a96e9eedfc6f0a4aeb
author Mathieu Chartier <mathieuc@google.com> Wed Jan 27 18:37:48 2016 -0800
committer Mathieu Chartier <mathieuc@google.com> Thu Jan 28 11:01:18 2016 -0800
tree ad759876aa1732cced4a026c01c02806b8355ec0
parent c43a8fc5640aea17785e47d52fc198d2952f9639

Remove some more read barriers in image relocation

Bug: 26786304
Bug: 22858531
Change-Id: I70dacae7657ebf6dac2b3dad7726eebe5a2b2649

runtime/mirror/dex_cache.h

diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h
index 0002076..7912510 100644
--- a/runtime/mirror/dex_cache.h
+++ b/runtime/mirror/dex_cache.h
@@ -61,11 +61,11 @@
   void Fixup(ArtMethod* trampoline, size_t pointer_size)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
-  template <typename Visitor>
+  template <ReadBarrierOption kReadBarrierOption = kWithReadBarrier, typename Visitor>
   void FixupStrings(GcRoot<mirror::String>* dest, const Visitor& visitor)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
-  template <typename Visitor>
+  template <ReadBarrierOption kReadBarrierOption = kWithReadBarrier, typename Visitor>
   void FixupResolvedTypes(GcRoot<mirror::Class>* dest, const Visitor& visitor)
       SHARED_REQUIRES(Locks::mutator_lock_);