1.1 --- a/src/share/vm/opto/connode.cpp Wed Mar 11 14:16:13 2009 -0700 1.2 +++ b/src/share/vm/opto/connode.cpp Thu Mar 12 10:37:46 2009 -0700 1.3 @@ -433,7 +433,7 @@ 1.4 // If not converting int->oop, throw away cast after constant propagation 1.5 Node *CastPPNode::Ideal_DU_postCCP( PhaseCCP *ccp ) { 1.6 const Type *t = ccp->type(in(1)); 1.7 - if (!t->isa_oop_ptr() || in(1)->is_DecodeN()) { 1.8 + if (!t->isa_oop_ptr() || (in(1)->is_DecodeN() && Universe::narrow_oop_use_implicit_null_checks())) { 1.9 return NULL; // do not transform raw pointers or narrow oops 1.10 } 1.11 return ConstraintCastNode::Ideal_DU_postCCP(ccp);