diff -r 9baa91bc7567 -r fc6cfe40e32a src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Fri Jul 13 11:21:55 2018 +0800
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp	Thu Jul 12 16:31:28 2018 +0200
@@ -236,6 +236,8 @@
 
   JVMCIKlassHandle klass(THREAD);
   oop result = NULL;
+  guarantee(h != NULL,
+            "If DebugInformationRecorder::describe_scope passes NULL oldCount == newCount must hold.");
   if (h->is_klass()) {
     klass = (Klass*) h;
     result = CompilerToVM::get_jvmci_type(klass, CATCH);