*** old/src/share/vm/opto/library_call.cpp	Mon May 19 21:08:36 2008
--- new/src/share/vm/opto/library_call.cpp	Mon May 19 21:08:35 2008

*** 2166,2176 ****
--- 2166,2176 ----
    case T_OBJECT:
       // reference stores need a store barrier.
      // (They don't if CAS fails, but it isn't worth checking.)
      pre_barrier(control(), base, adr, alias_idx, newval, value_type, T_OBJECT);
  #ifdef _LP64
!     if (adr->bottom_type()->is_narrow()) {
!     if (adr->bottom_type()->is_ptr_to_narrowoop()) {
        cas = _gvn.transform(new (C, 5) CompareAndSwapNNode(control(), mem, adr,
                                                             EncodePNode::encode(&_gvn, newval),
                                                             EncodePNode::encode(&_gvn, oldval)));
      } else
  #endif