diff options
| -rw-r--r-- | runtime/interpreter/unstarted_runtime.cc | 18 | ||||
| -rw-r--r-- | runtime/native/java_lang_reflect_Constructor.cc | 2 | ||||
| -rw-r--r-- | runtime/native/java_lang_reflect_Method.cc | 2 | ||||
| -rw-r--r-- | runtime/reflection.cc | 18 | ||||
| -rw-r--r-- | runtime/reflection.h | 2 |
5 files changed, 36 insertions, 6 deletions
diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index 99cd5470c3..229142ec4c 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -687,7 +687,12 @@ void UnstartedRuntime::UnstartedConstructorNewInstance0( soa.AddLocalReference<jobject>(receiver.Get())); ScopedLocalRef<jobject> args_ref(self->GetJniEnv(), soa.AddLocalReference<jobject>(args.Get())); - InvokeMethod(soa, method_ref.get(), object_ref.get(), args_ref.get(), 2); + PointerSize pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize(); + if (pointer_size == PointerSize::k64) { + InvokeMethod<PointerSize::k64>(soa, method_ref.get(), object_ref.get(), args_ref.get(), 2); + } else { + InvokeMethod<PointerSize::k32>(soa, method_ref.get(), object_ref.get(), args_ref.get(), 2); + } } if (self->IsExceptionPending()) { AbortTransactionOrFail(self, "Failed running constructor"); @@ -1644,8 +1649,17 @@ void UnstartedRuntime::UnstartedMethodInvoke( ScopedLocalRef<jobject> java_args(env, java_args_obj == nullptr ? nullptr : env->AddLocalReference<jobject>(java_args_obj)); + PointerSize pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize(); ScopedLocalRef<jobject> result_jobj(env, - InvokeMethod(soa, java_method.get(), java_receiver.get(), java_args.get())); + (pointer_size == PointerSize::k64) + ? InvokeMethod<PointerSize::k64>(soa, + java_method.get(), + java_receiver.get(), + java_args.get()) + : InvokeMethod<PointerSize::k32>(soa, + java_method.get(), + java_receiver.get(), + java_args.get())); result->SetL(self->DecodeJObject(result_jobj.get())); diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc index e11b0e4b03..1d362c0302 100644 --- a/runtime/native/java_lang_reflect_Constructor.cc +++ b/runtime/native/java_lang_reflect_Constructor.cc @@ -105,7 +105,7 @@ static jobject Constructor_newInstance0(JNIEnv* env, jobject javaMethod, jobject // String constructor is replaced by a StringFactory method in InvokeMethod. if (UNLIKELY(c->IsStringClass())) { - return InvokeMethod(soa, javaMethod, nullptr, javaArgs, 2); + return InvokeMethod<kRuntimePointerSize>(soa, javaMethod, nullptr, javaArgs, 2); } ObjPtr<mirror::Object> receiver = diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc index 66fef4cddc..2c0dd806e1 100644 --- a/runtime/native/java_lang_reflect_Method.cc +++ b/runtime/native/java_lang_reflect_Method.cc @@ -83,7 +83,7 @@ static jobjectArray Method_getExceptionTypes(JNIEnv* env, jobject javaMethod) { static jobject Method_invoke(JNIEnv* env, jobject javaMethod, jobject javaReceiver, jobjectArray javaArgs) { ScopedFastNativeObjectAccess soa(env); - return InvokeMethod(soa, javaMethod, javaReceiver, javaArgs); + return InvokeMethod<kRuntimePointerSize>(soa, javaMethod, javaReceiver, javaArgs); } static JNINativeMethod gMethods[] = { diff --git a/runtime/reflection.cc b/runtime/reflection.cc index 469d3297e4..3b668a2245 100644 --- a/runtime/reflection.cc +++ b/runtime/reflection.cc @@ -683,6 +683,7 @@ JValue InvokeVirtualOrInterfaceWithVarArgs(const ScopedObjectAccessAlreadyRunnab return InvokeVirtualOrInterfaceWithVarArgs(soa, obj, jni::DecodeArtMethod(mid), args); } +template <PointerSize kPointerSize> jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject javaMethod, jobject javaReceiver, jobject javaArgs, size_t num_frames) { // We want to make sure that the stack is not within a small distance from the @@ -725,14 +726,14 @@ jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject javaM } // Find the actual implementation of the virtual method. - m = receiver->GetClass()->FindVirtualMethodForVirtualOrInterface(m, kRuntimePointerSize); + m = receiver->GetClass()->FindVirtualMethodForVirtualOrInterface(m, kPointerSize); } } // Get our arrays of arguments and their types, and check they're the same size. ObjPtr<mirror::ObjectArray<mirror::Object>> objects = soa.Decode<mirror::ObjectArray<mirror::Object>>(javaArgs); - auto* np_method = m->GetInterfaceMethodIfProxy(kRuntimePointerSize); + auto* np_method = m->GetInterfaceMethodIfProxy(kPointerSize); if (!CheckArgsForInvokeMethod(np_method, objects)) { return nullptr; } @@ -764,6 +765,19 @@ jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject javaM return soa.AddLocalReference<jobject>(BoxPrimitive(Primitive::GetType(shorty[0]), result)); } +template +jobject InvokeMethod<PointerSize::k32>(const ScopedObjectAccessAlreadyRunnable& soa, + jobject javaMethod, + jobject javaReceiver, + jobject javaArgs, + size_t num_frames); +template +jobject InvokeMethod<PointerSize::k64>(const ScopedObjectAccessAlreadyRunnable& soa, + jobject javaMethod, + jobject javaReceiver, + jobject javaArgs, + size_t num_frames); + void InvokeConstructor(const ScopedObjectAccessAlreadyRunnable& soa, ArtMethod* constructor, ObjPtr<mirror::Object> receiver, diff --git a/runtime/reflection.h b/runtime/reflection.h index 5a2da35ff5..b0e27da321 100644 --- a/runtime/reflection.h +++ b/runtime/reflection.h @@ -17,6 +17,7 @@ #ifndef ART_RUNTIME_REFLECTION_H_ #define ART_RUNTIME_REFLECTION_H_ +#include "base/enums.h" #include "base/locks.h" #include "dex/primitive.h" #include "jni.h" @@ -97,6 +98,7 @@ JValue InvokeVirtualOrInterfaceWithVarArgs(const ScopedObjectAccessAlreadyRunnab REQUIRES_SHARED(Locks::mutator_lock_); // num_frames is number of frames we look up for access check. +template<PointerSize pointer_size> jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject method, jobject receiver, |