--- old/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp	2019-09-11 09:46:24.262944577 -0400
+++ new/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp	2019-09-11 09:46:23.745108654 -0400
@@ -1952,7 +1952,7 @@
   __ 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);
   }