From c0542af3e2170143ba40d89136e284997e16bf64 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 3 Sep 2014 16:16:56 -0700 Subject: Remove abuse of mirror::Object* to reference special values. Remove kInvalidIndirectRefObject, kClearedJniWeakGlobal and ObjectRegistry::kInvalidObject. Handle error conditions by passing in or returning an error value. GetObjectRefType is simplified to be faster and not return invalid references that are not expected according to the spec. Adjust check JNI and jni_internal_test appropriately. Fix cases in the debugger/JDWP of out arguments being passed by reference. Bug: 17376993 Change-Id: I3ce8a28c01827e163f4dc288449959464da788b1 --- runtime/java_vm_ext.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/java_vm_ext.cc') diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index dd3b7cf2b2..424addb2a8 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -28,6 +28,7 @@ #include "nativebridge/native_bridge.h" #include "java_vm_ext.h" #include "parsed_options.h" +#include "runtime-inl.h" #include "ScopedLocalRef.h" #include "scoped_thread_state_change.h" #include "thread-inl.h" @@ -761,7 +762,7 @@ void JavaVMExt::SweepJniWeakGlobals(IsMarkedCallback* callback, void* arg) { mirror::Object* obj = *entry; mirror::Object* new_obj = callback(obj, arg); if (new_obj == nullptr) { - new_obj = kClearedJniWeakGlobal; + new_obj = Runtime::Current()->GetClearedJniWeakGlobal(); } *entry = new_obj; } -- cgit v1.2.3