commit ab088118d33caafb00815ab72ac0fd7374169f64
author Hiroshi Yamauchi <yamauchi@google.com> Mon Jul 14 13:00:14 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Mon Jul 14 13:00:14 2014 -0700
tree 9ca1473bb6d4e896f8b8d5c19341dcba1ad37cd5
parent e8b8086388159be5fecb23ae6185e70f3dfb5da6

Add read barriers for the roots in Runtime.

Bug: 12687968
Change-Id: If26518a8251702cfe4d5cd7d1f50e80e342704cf

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 94d6cdf..c354ad5 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -910,11 +910,13 @@
   thread_list_->Unregister(self);
 }
 
-  mirror::Throwable* Runtime::GetPreAllocatedOutOfMemoryError() const {
-  if (pre_allocated_OutOfMemoryError_ == NULL) {
+mirror::Throwable* Runtime::GetPreAllocatedOutOfMemoryError() {
+  mirror::Throwable* oome = ReadBarrier::BarrierForRoot<mirror::Throwable, kWithReadBarrier>(
+      &pre_allocated_OutOfMemoryError_);
+  if (oome == NULL) {
     LOG(ERROR) << "Failed to return pre-allocated OOME";
   }
-  return pre_allocated_OutOfMemoryError_;
+  return oome;
 }
 
 void Runtime::VisitConstantRoots(RootCallback* callback, void* arg) {