--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -1034,7 +1034,7 @@
 
   if (jap.get_ret_type() == T_VOID) {
     return NULL;
-  } else if (jap.get_ret_type() == T_OBJECT || jap.get_ret_type() == T_ARRAY) {
+  } else if (is_reference_type(jap.get_ret_type())) {
     return JNIHandles::make_local((oop) result.get_jobject());
   } else {
     jvalue *value = (jvalue *) result.get_value_addr();