--- old/src/share/vm/opto/output.cpp 2013-05-08 18:17:26.000000000 -0700 +++ new/src/share/vm/opto/output.cpp 2013-05-08 18:17:26.000000000 -0700 @@ -929,7 +929,7 @@ scval = new_loc_value( _regalloc, obj_reg, Location::oop ); } } else { - const TypePtr *tp = obj_node->bottom_type()->make_ptr(); + const TypePtr *tp = obj_node->get_ptr_type(); scval = new ConstantOopWriteValue(tp->is_oopptr()->const_oop()->constant_encoding()); }