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

*** 2781,2791 ****
--- 2781,2791 ----
    insert_mem_bar(Op_MemBarCPUOrder);
    insert_mem_bar(Op_MemBarAcquire);
  
  #ifdef _LP64
    if (type == T_OBJECT && adr->bottom_type()->is_ptr_to_narrowoop() && kind == LS_xchg) {
!     load_store = _gvn.transform(new (C) DecodeNNode(load_store, load_store->bottom_type()->make_ptr()));
!     load_store = _gvn.transform(new (C) DecodeNNode(load_store, load_store->get_ptr_type()));
    }
  #endif
  
    assert(type2size[load_store->bottom_type()->basic_type()] == type2size[rtype], "result type should match");
    set_result(load_store);