--- old/src/share/vm/opto/library_call.cpp	2017-07-14 16:33:38.109651926 +0200
+++ new/src/share/vm/opto/library_call.cpp	2017-07-14 16:33:38.013651931 +0200
@@ -3586,7 +3586,7 @@
       phi->add_req(makecon(TypeInstPtr::make(env()->Object_klass()->java_mirror())));
     // If we fall through, it's a plain class.  Get its _super.
     p = basic_plus_adr(kls, in_bytes(Klass::super_offset()));
-    kls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::OBJECT_OR_NULL));
+    kls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::BOTTOM));
     null_ctl = top();
     kls = null_check_oop(kls, &null_ctl);
     if (null_ctl != top()) {
@@ -3728,7 +3728,7 @@
   record_for_igvn(region);
 
   const TypePtr* adr_type = TypeRawPtr::BOTTOM;   // memory type of loads
-  const TypeKlassPtr* kls_type = TypeKlassPtr::OBJECT_OR_NULL;
+  const TypeKlassPtr* kls_type = TypeKlassPtr::BOTTOM;
   int class_klass_offset = java_lang_Class::klass_offset_in_bytes();
 
   // First null-check both mirrors and load each mirror's klass metaobject.