src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

@@ -1950,11 +1950,11 @@
   }
 
   __ reset_last_Java_frame(false);
 
   // Unbox oop result, e.g. JNIHandles::resolve result.
-  if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
+  if (is_reference_type(ret_type)) {
     __ resolve_jobject(r0, rthread, rscratch2);
   }
 
   if (CheckJNICalls) {
     // clear_pending_jni_exception_check