--- a/hotspot/src/share/vm/opto/output.cpp	Wed May 08 15:08:01 2013 -0700
+++ b/hotspot/src/share/vm/opto/output.cpp	Thu May 09 17:28:04 2013 -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());
       }