commit 1cc71ebf333ca323ae0e130fefbce4593e385c10
author Hiroshi Yamauchi <yamauchi@google.com> Thu May 07 10:47:27 2015 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu May 07 11:28:08 2015 -0700
tree e94897ebb36a21f1c276fc69c44f6a3522cbe093
parent 35b6625c21e9304dd79700f4ff1c26a7e30d2b2d

Insert a read barrier in the JNI bridge.

Bug: 20720510
Bug: 12687968
Change-Id: Ia9edb614853bad45ec25d6e2142361a8bda1eccf

runtime/arch/mips/entrypoints_init_mips.cc

diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc
index a980a86..ff04106 100644
--- a/runtime/arch/mips/entrypoints_init_mips.cc
+++ b/runtime/arch/mips/entrypoints_init_mips.cc
@@ -272,6 +272,9 @@
   static_assert(IsDirectEntrypoint(kQuickA64Load), "Non-direct C stub marked direct.");
   qpoints->pA64Store = QuasiAtomic::Write64;
   static_assert(IsDirectEntrypoint(kQuickA64Store), "Non-direct C stub marked direct.");
+
+  qpoints->pReadBarrierJni = ReadBarrierJni;
+  static_assert(!IsDirectEntrypoint(kQuickReadBarrierJni), "Non-direct C stub marked direct.");
 };
 
 }  // namespace art