*** old/src/share/vm/opto/output.cpp	Wed May  8 18:17:26 2013
--- new/src/share/vm/opto/output.cpp	Wed May  8 18:17:26 2013

*** 927,937 ****
--- 927,937 ----
            scval = new_loc_value( _regalloc, obj_reg, Location::narrowoop );
          } else {
            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());
        }
  
        OptoReg::Name box_reg = BoxLockNode::reg(box_node);
        Location basic_lock = Location::new_stk_loc(Location::normal,_regalloc->reg2offset(box_reg));