--- old/src/hotspot/share/classfile/verificationType.hpp	2018-10-08 03:01:32.670752300 -0400
+++ new/src/hotspot/share/classfile/verificationType.hpp	2018-10-08 03:01:31.042658224 -0400
@@ -312,7 +312,7 @@
         case Short:
           return false;
         default:
-          return is_assignable_from(from, context, from_field_is_protected, CHECK_false);
+          return is_assignable_from(from, context, from_field_is_protected, THREAD);
       }
     }
   }