--- a/src/hotspot/share/prims/jvm.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/prims/jvm.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -773,7 +773,7 @@
   JVMWrapper("JVM_FindPrimitiveClass");
   oop mirror = NULL;
   BasicType t = name2type(utf);
-  if (t != T_ILLEGAL && t != T_OBJECT && t != T_ARRAY) {
+  if (t != T_ILLEGAL && !is_reference_type(t)) {
     mirror = Universe::java_mirror(t);
   }
   if (mirror == NULL) {