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

*** 2676,2686 ****
--- 2676,2692 ----
      break;
    case T_LONG:
      cas = _gvn.transform(new (C, 5) CompareAndSwapLNode(control(), mem, adr, newval, oldval));
      break;
    case T_OBJECT:
       // reference stores need a store barrier.
+     // 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(newval) == TypePtr::NULL_PTR)
+       newval = _gvn.makecon(TypePtr::NULL_PTR);
+ 
+     // Reference stores need a store barrier.
      // (They don't if CAS fails, but it isn't worth checking.)
      pre_barrier(true /* do_load*/,
                  control(), base, adr, alias_idx, newval, value_type->make_oopptr(),
                  NULL /* pre_val*/,
                  T_OBJECT);