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/entrypoints/entrypoint_utils.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'runtime/entrypoints/entrypoint_utils.cc') diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index be3895a726..4755b9e9db 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -220,7 +220,8 @@ void CheckReferenceResult(mirror::Object* o, Thread* self) { } mirror::ArtMethod* m = self->GetCurrentMethod(NULL); if (o == kInvalidIndirectRefObject) { - JniAbortF(NULL, "invalid reference returned from %s", PrettyMethod(m).c_str()); + Runtime::Current()->GetJavaVM()->JniAbortF(NULL, "invalid reference returned from %s", + PrettyMethod(m).c_str()); } // Make sure that the result is an instance of the type this method was expected to return. StackHandleScope<1> hs(self); @@ -228,8 +229,9 @@ void CheckReferenceResult(mirror::Object* o, Thread* self) { mirror::Class* return_type = MethodHelper(h_m).GetReturnType(); if (!o->InstanceOf(return_type)) { - JniAbortF(NULL, "attempt to return an instance of %s from %s", PrettyTypeOf(o).c_str(), - PrettyMethod(h_m.Get()).c_str()); + Runtime::Current()->GetJavaVM()->JniAbortF(NULL, "attempt to return an instance of %s from %s", + PrettyTypeOf(o).c_str(), + PrettyMethod(h_m.Get()).c_str()); } } -- cgit v1.2.3-59-g8ed1b