--- old/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2019-05-02 20:35:13.671156055 -0700
+++ new/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	2019-05-02 20:35:13.377145898 -0700
@@ -557,7 +557,10 @@
   Klass* klass = cp->klass_at(index, CHECK_NULL);
   JVMCIKlassHandle resolved_klass(THREAD, klass);
   if (resolved_klass->is_instance_klass()) {
-    InstanceKlass::cast(resolved_klass())->link_class_or_fail(THREAD);
+    bool linked = InstanceKlass::cast(resolved_klass())->link_class_or_fail(CHECK_NULL);
+    if (!linked) {
+      return NULL;
+    }
   }
   JVMCIObject klassObject = JVMCIENV->get_jvmci_type(resolved_klass, JVMCI_CHECK_NULL);
   return JVMCIENV->get_jobject(klassObject);