commit 024d69fb9936ca5a0031d35c9f248853cbc25d3f
author Vladimir Marko <vmarko@google.com> Thu Jun 13 10:52:32 2019 +0100
committer Vladimir Marko <vmarko@google.com> Mon Jun 17 09:30:53 2019 +0000
tree c1eeddf91ea15eda5d139d4592ac7f0df80e9be0
parent 43ae4acf219fe25a56e2055ebcebc4d08020a25d

Use cleared JNI weak sentinel from boot image.

We were already adding the sentinel to the boot image,
so we may as well reuse the boot image copy.

Also move pre-allocated objects from class roots to the
boot image live objects.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Change-Id: I635dcdd146ca2c6b55d187e9a545a9990b0b35ca

runtime/runtime.h

diff --git a/runtime/runtime.h b/runtime/runtime.h
index dd66b85..7050fd2 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -719,7 +719,7 @@
   }
 
   // Called from class linker.
-  void SetSentinel(mirror::Object* sentinel) REQUIRES_SHARED(Locks::mutator_lock_);
+  void SetSentinel(ObjPtr<mirror::Object> sentinel) REQUIRES_SHARED(Locks::mutator_lock_);
   // For testing purpose only.
   // TODO: Remove this when this is no longer needed (b/116087961).
   GcRoot<mirror::Object> GetSentinel() REQUIRES_SHARED(Locks::mutator_lock_);