commit 043eb9a4496cacaffe60f381c5686c989cb5d701
author Hiroshi Yamauchi <yamauchi@google.com> Fri Oct 14 11:21:38 2016 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Fri Oct 14 13:04:25 2016 -0700
tree 42f89fbff75828cc962992000fa6f018fb46caa4
parent cfdff144f154df876987fefb340058a975c43381

Add a mark bit check in the read barrier jni entrypoint.

Bug: 30437917
Bug: 12687968
Test: test-art host/N9, N9 libartd boot, Ritz EAAC.
Change-Id: Ic5f8080959f243e80f00da73ba5f4b91a8d8b617

runtime/entrypoints/quick/quick_jni_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
index 20fa0d8..383cdd2 100644
--- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
@@ -24,6 +24,15 @@
 
 extern void ReadBarrierJni(mirror::CompressedReference<mirror::Object>* handle_on_stack,
                            Thread* self ATTRIBUTE_UNUSED) {
+  DCHECK(kUseReadBarrier);
+  if (kUseBakerReadBarrier) {
+    DCHECK(handle_on_stack->AsMirrorPtr() != nullptr)
+        << "The class of a static jni call must not be null";
+    // Check the mark bit and return early if it's already marked.
+    if (LIKELY(handle_on_stack->AsMirrorPtr()->GetMarkBit() != 0)) {
+      return;
+    }
+  }
   // Call the read barrier and update the handle.
   mirror::Object* to_ref = ReadBarrier::BarrierForRoot(handle_on_stack);
   handle_on_stack->Assign(to_ref);