1.1 --- a/src/share/vm/opto/compile.cpp Wed Mar 18 11:37:48 2009 -0400 1.2 +++ b/src/share/vm/opto/compile.cpp Thu Mar 19 09:13:24 2009 -0700 1.3 @@ -2081,7 +2081,7 @@ 1.4 1.5 #ifdef _LP64 1.6 case Op_CastPP: 1.7 - if (n->in(1)->is_DecodeN() && UseImplicitNullCheckForNarrowOop) { 1.8 + if (n->in(1)->is_DecodeN() && Universe::narrow_oop_use_implicit_null_checks()) { 1.9 Compile* C = Compile::current(); 1.10 Node* in1 = n->in(1); 1.11 const Type* t = n->bottom_type(); 1.12 @@ -2136,7 +2136,7 @@ 1.13 new_in2 = in2->in(1); 1.14 } else if (in2->Opcode() == Op_ConP) { 1.15 const Type* t = in2->bottom_type(); 1.16 - if (t == TypePtr::NULL_PTR && UseImplicitNullCheckForNarrowOop) { 1.17 + if (t == TypePtr::NULL_PTR && Universe::narrow_oop_use_implicit_null_checks()) { 1.18 new_in2 = ConNode::make(C, TypeNarrowOop::NULL_PTR); 1.19 // 1.20 // This transformation together with CastPP transformation above