1.1 --- a/src/share/vm/opto/library_call.cpp Wed May 21 10:45:07 2008 -0700
1.2 +++ b/src/share/vm/opto/library_call.cpp Wed May 21 13:46:23 2008 -0700
1.3 @@ -896,7 +896,7 @@
1.4 Node* sourcea = basic_plus_adr(string_object, string_object, value_offset);
1.5 Node* source = make_load(no_ctrl, sourcea, source_type, T_OBJECT, string_type->add_offset(value_offset));
1.6
1.7 - Node* target = _gvn.transform(ConPNode::make(C, target_array));
1.8 + Node* target = _gvn.transform( makecon(TypeOopPtr::make_from_constant(target_array)) );
1.9 jint target_length = target_array->length();
1.10 const TypeAry* target_array_type = TypeAry::make(TypeInt::CHAR, TypeInt::make(0, target_length, Type::WidenMin));
1.11 const TypeAryPtr* target_type = TypeAryPtr::make(TypePtr::BotPTR, target_array_type, target_array->klass(), true, Type::OffsetBot);
1.12 @@ -2454,7 +2454,7 @@
1.13 if (region == NULL) never_see_null = true;
1.14 Node* p = basic_plus_adr(mirror, offset);
1.15 const TypeKlassPtr* kls_type = TypeKlassPtr::OBJECT_OR_NULL;
1.16 - Node* kls = _gvn.transform(new (C, 3) LoadKlassNode(0, immutable_memory(), p, TypeRawPtr::BOTTOM, kls_type));
1.17 + Node* kls = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeRawPtr::BOTTOM, kls_type) );
1.18 _sp += nargs; // any deopt will start just before call to enclosing method
1.19 Node* null_ctl = top();
1.20 kls = null_check_oop(kls, &null_ctl, never_see_null);
1.21 @@ -2634,7 +2634,7 @@
1.22 phi->add_req(makecon(TypeInstPtr::make(env()->Object_klass()->java_mirror())));
1.23 // If we fall through, it's a plain class. Get its _super.
1.24 p = basic_plus_adr(kls, Klass::super_offset_in_bytes() + sizeof(oopDesc));
1.25 - kls = _gvn.transform(new (C, 3) LoadKlassNode(0, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::OBJECT_OR_NULL));
1.26 + kls = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeKlassPtr::OBJECT_OR_NULL) );
1.27 null_ctl = top();
1.28 kls = null_check_oop(kls, &null_ctl);
1.29 if (null_ctl != top()) {
1.30 @@ -2720,7 +2720,7 @@
1.31 args[which_arg] = _gvn.transform(arg);
1.32
1.33 Node* p = basic_plus_adr(arg, class_klass_offset);
1.34 - Node* kls = new (C, 3) LoadKlassNode(0, immutable_memory(), p, adr_type, kls_type);
1.35 + Node* kls = LoadKlassNode::make(_gvn, immutable_memory(), p, adr_type, kls_type);
1.36 klasses[which_arg] = _gvn.transform(kls);
1.37 }
1.38
1.39 @@ -4388,7 +4388,7 @@
1.40 // (At this point we can assume disjoint_bases, since types differ.)
1.41 int ek_offset = objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc);
1.42 Node* p1 = basic_plus_adr(dest_klass, ek_offset);
1.43 - Node* n1 = new (C, 3) LoadKlassNode(0, immutable_memory(), p1, TypeRawPtr::BOTTOM);
1.44 + Node* n1 = LoadKlassNode::make(_gvn, immutable_memory(), p1, TypeRawPtr::BOTTOM);
1.45 Node* dest_elem_klass = _gvn.transform(n1);
1.46 Node* cv = generate_checkcast_arraycopy(adr_type,
1.47 dest_elem_klass,
