commit 0ba1fed9978ba2fbfe129fe62095c983e8a5391b
author Mathieu Chartier <mathieuc@google.com> Tue Sep 02 16:20:45 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Sep 17 23:26:39 2014 -0700
tree 996dc13bb399f8b569c76551ceae3bcf9e15803a
parent 25fe3d52706f7be2c7c4f43449b019565fa15854

Add missing read barriers to intern table.

Also deleted GcRoot::Assign.

(cherry picked from commit c2bda539093db61be1f4095e579f6e68db8a23f1)

Change-Id: Id286020e47d19862ec43dc1908b5e9d85b76c279

runtime/gc_root-inl.h

diff --git a/runtime/gc_root-inl.h b/runtime/gc_root-inl.h
index 2661e54..482f7bc 100644
--- a/runtime/gc_root-inl.h
+++ b/runtime/gc_root-inl.h
@@ -29,10 +29,5 @@
   return ReadBarrier::BarrierForRoot<MirrorType, kReadBarrierOption>(&root_);
 }
 
-template<class MirrorType>
-inline void GcRoot<MirrorType>::Assign(MirrorType* value) {
-  root_ = value;
-}
-
 }  // namespace art
 #endif  // ART_RUNTIME_GC_ROOT_INL_H_

runtime/gc_root.h

diff --git a/runtime/gc_root.h b/runtime/gc_root.h
index 3928f5d..b10a55c 100644
--- a/runtime/gc_root.h
+++ b/runtime/gc_root.h
@@ -28,7 +28,6 @@
  public:
   template<ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
   ALWAYS_INLINE MirrorType* Read() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  ALWAYS_INLINE void Assign(MirrorType* value) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   void VisitRoot(RootCallback* callback, void* arg, uint32_t thread_id, RootType root_type) {
     callback(reinterpret_cast<mirror::Object**>(&root_), arg, thread_id, root_type);