Quick fix backport

azul-research · Dec 9, 2021 · 724ed1c · 724ed1c
1 parent 1801725
commit 724ed1c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -71,12 +71,12 @@ template<> struct BasicTypeToJni<T_LONG>    { static const jlong    jni_type; };
 template<> struct BasicTypeToJni<T_FLOAT>   { static const jfloat   jni_type; };
 template<> struct BasicTypeToJni<T_DOUBLE>  { static const jdouble  jni_type; };
 
-template<int BType, typename JniType = decltype(BasicTypeToJni<BType>::jni_type)>
-JniType static_fast_get_field_wrapper(JNIEnv *env, jobject obj, jfieldID fieldID) {
+template<int BType>
+decltype(BasicTypeToJni<BType>::jni_type) static_fast_get_field_wrapper(JNIEnv *env, jobject obj, jfieldID fieldID) {
   JavaThread* thread = JavaThread::thread_from_jni_environment(env);
   ThreadWXEnable wx(WXExec, thread);
   address get_field_addr = generated_fast_get_field[BType - T_BOOLEAN];
-  return ((JniType(*)(JNIEnv *env, jobject obj, jfieldID fieldID))get_field_addr)(env, obj, fieldID);
+  return ((decltype(BasicTypeToJni<BType>::jni_type)(*)(JNIEnv *env, jobject obj, jfieldID fieldID))get_field_addr)(env, obj, fieldID);
 }
 
 template<int BType>