1.1 --- a/src/share/vm/opto/library_call.cpp Fri Nov 07 09:36:34 2014 -0800
1.2 +++ b/src/share/vm/opto/library_call.cpp Mon Nov 10 17:14:59 2014 +0100
1.3 @@ -3398,7 +3398,7 @@
1.4 if (region == NULL) never_see_null = true;
1.5 Node* p = basic_plus_adr(mirror, offset);
1.6 const TypeKlassPtr* kls_type = TypeKlassPtr::OBJECT_OR_NULL;
1.7 - Node* kls = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeRawPtr::BOTTOM, kls_type));
1.8 + Node* kls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), p, TypeRawPtr::BOTTOM, kls_type));
1.9 Node* null_ctl = top();
1.10 kls = null_check_oop(kls, &null_ctl, never_see_null);
1.11 if (region != NULL) {
1.12 @@ -3574,7 +3574,7 @@
1.13 phi->add_req(makecon(TypeInstPtr::make(env()->Object_klass()->java_mirror())));
1.14 // If we fall through, it's a plain class. Get its _super.
1.15 p = basic_plus_adr(kls, in_bytes(Klass::super_offset()));
1.16 - kls = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::OBJECT_OR_NULL));
1.17 + kls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::OBJECT_OR_NULL));
1.18 null_ctl = top();
1.19 kls = null_check_oop(kls, &null_ctl);
1.20 if (null_ctl != top()) {
1.21 @@ -3656,7 +3656,7 @@
1.22 args[which_arg] = arg;
1.23
1.24 Node* p = basic_plus_adr(arg, class_klass_offset);
1.25 - Node* kls = LoadKlassNode::make(_gvn, immutable_memory(), p, adr_type, kls_type);
1.26 + Node* kls = LoadKlassNode::make(_gvn, NULL, immutable_memory(), p, adr_type, kls_type);
1.27 klasses[which_arg] = _gvn.transform(kls);
1.28 }
1.29
1.30 @@ -5172,7 +5172,7 @@
1.31 // (At this point we can assume disjoint_bases, since types differ.)
1.32 int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
1.33 Node* p1 = basic_plus_adr(dest_klass, ek_offset);
1.34 - Node* n1 = LoadKlassNode::make(_gvn, immutable_memory(), p1, TypeRawPtr::BOTTOM);
1.35 + Node* n1 = LoadKlassNode::make(_gvn, NULL, immutable_memory(), p1, TypeRawPtr::BOTTOM);
1.36 Node* dest_elem_klass = _gvn.transform(n1);
1.37 Node* cv = generate_checkcast_arraycopy(adr_type,
1.38 dest_elem_klass,
