*** old/src/share/vm/opto/graphKit.cpp	Tue Feb  7 16:22:52 2012
--- new/src/share/vm/opto/graphKit.cpp	Tue Feb  7 16:22:52 2012

*** 1520,1529 ****
--- 1520,1534 ----
                            const TypePtr* adr_type,
                            Node* val,
                            const TypeOopPtr* val_type,
                            BasicType bt,
                            bool use_precise) {
+   // Transformation of a value which could be NULL pointer (CastPP #NULL)
+   // could be delayed during Parse (for example, in adjust_map_after_if()).
+   // Execute transformation here to avoid barrier generation in such case.
+   if (_gvn.type(val) == TypePtr::NULL_PTR)
+     val = _gvn.makecon(TypePtr::NULL_PTR);
  
    set_control(ctl);
    if (stopped()) return top(); // Dead path ?
  
    assert(bt == T_OBJECT, "sanity");