src/hotspot/share/prims/unsafe.cpp

*** 901,964 ****
  UNSAFE_ENTRY(jobject, Unsafe_CompareAndExchangeReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject e_h, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop e = JNIHandles::resolve(e_h);
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
!   oop res = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e);
    return JNIHandles::make_local(env, res);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jint, Unsafe_CompareAndExchangeInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jint* addr = (volatile jint*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(x, addr, e);
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e);
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jlong, Unsafe_CompareAndExchangeLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong e, jlong x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jlong* addr = (volatile jlong*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(x, addr, e);
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e);
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject e_h, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop e = JNIHandles::resolve(e_h);
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
!   oop ret = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e);
    return ret == e;
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jint* addr = (volatile jint*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(x, addr, e) == e;
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e) == e;
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong e, jlong x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jlong* addr = (volatile jlong*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(x, addr, e) == e;
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(x, p, (ptrdiff_t)offset, e) == e;
    }
  } UNSAFE_END
  
  static void post_thread_park_event(EventThreadPark* event, const oop obj, jlong timeout_nanos, jlong until_epoch_millis) {
    assert(event != NULL, "invariant");
--- 901,964 ----
  UNSAFE_ENTRY(jobject, Unsafe_CompareAndExchangeReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject e_h, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop e = JNIHandles::resolve(e_h);
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
!   oop res = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x);
    return JNIHandles::make_local(env, res);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jint, Unsafe_CompareAndExchangeInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jint* addr = (volatile jint*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(addr, e, x);
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x);
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jlong, Unsafe_CompareAndExchangeLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong e, jlong x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jlong* addr = (volatile jlong*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(addr, e, x);
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x);
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject e_h, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop e = JNIHandles::resolve(e_h);
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
!   oop ret = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x);
    return ret == e;
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jint* addr = (volatile jint*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(addr, e, x) == e;
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x) == e;
    }
  } UNSAFE_END
  
  UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong e, jlong x)) {
    oop p = JNIHandles::resolve(obj);
    if (p == NULL) {
      volatile jlong* addr = (volatile jlong*)index_oop_from_field_offset_long(p, offset);
!     return RawAccess<>::atomic_cmpxchg(addr, e, x) == e;
    } else {
      assert_field_offset_sane(p, offset);
!     return HeapAccess<>::atomic_cmpxchg_at(p, (ptrdiff_t)offset, e, x) == e;
    }
  } UNSAFE_END
  
  static void post_thread_park_event(EventThreadPark* event, const oop obj, jlong timeout_nanos, jlong until_epoch_millis) {
    assert(event != NULL, "invariant");