From 68d8b42ddec39ec0174162d90d4abaa004d1983e Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 17 Jul 2014 11:09:10 -0700 Subject: Wire up check JNI force copy mode. Increase check JNI checks. Break apart jni_internal.h in to jni_env_ext.h and java_vm_ext.h. Fix the abuse of ScopedObjectAccess/annotalysis by ScopedCheck in the case of VM routines. Make class loader override and shared library class loader JNI global references rather than mirror pointers. Clean-ups to native bridge. Change-Id: If7c6110b5aade7a402bfb67534af86a7b2cdeb55 --- runtime/scoped_thread_state_change.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'runtime/scoped_thread_state_change.h') diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h index 23aca45002..ae3eaf2e22 100644 --- a/runtime/scoped_thread_state_change.h +++ b/runtime/scoped_thread_state_change.h @@ -18,7 +18,8 @@ #define ART_RUNTIME_SCOPED_THREAD_STATE_CHANGE_H_ #include "base/casts.h" -#include "jni_internal-inl.h" +#include "java_vm_ext.h" +#include "jni_env_ext-inl.h" #include "read_barrier.h" #include "thread-inl.h" #include "verify_object.h" @@ -114,6 +115,10 @@ class ScopedObjectAccessAlreadyRunnable { return vm_; } + bool ForceCopy() const { + return vm_->ForceCopy(); + } + /* * Add a local reference for an object to the indirect reference table associated with the * current stack frame. When the native function returns, the reference will be discarded. -- cgit v1.2.3-59-g8ed1b