src/hotspot/share/prims/unsafe.cpp

*** 263,273 ****
  // That is, it should be in the range [0, MAX_OBJECT_SIZE].
  UNSAFE_ENTRY(jobject, Unsafe_GetReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) {
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
    oop v = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(p, offset);
!   return JNIHandles::make_local(env, v);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_PutReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop p = JNIHandles::resolve(obj);
--- 263,273 ----
  // That is, it should be in the range [0, MAX_OBJECT_SIZE].
  UNSAFE_ENTRY(jobject, Unsafe_GetReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) {
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
    oop v = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(p, offset);
!   return JNIHandles::make_local(THREAD, v);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_PutReference(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop p = JNIHandles::resolve(obj);
*** 277,287 ****
  
  UNSAFE_ENTRY(jobject, Unsafe_GetReferenceVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) {
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
    oop v = HeapAccess<MO_SEQ_CST | ON_UNKNOWN_OOP_REF>::oop_load_at(p, offset);
!   return JNIHandles::make_local(env, v);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_PutReferenceVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop p = JNIHandles::resolve(obj);
--- 277,287 ----
  
  UNSAFE_ENTRY(jobject, Unsafe_GetReferenceVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) {
    oop p = JNIHandles::resolve(obj);
    assert_field_offset_sane(p, offset);
    oop v = HeapAccess<MO_SEQ_CST | ON_UNKNOWN_OOP_REF>::oop_load_at(p, offset);
!   return JNIHandles::make_local(THREAD, v);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_PutReferenceVolatile(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jobject x_h)) {
    oop x = JNIHandles::resolve(x_h);
    oop p = JNIHandles::resolve(obj);
*** 289,299 ****
    HeapAccess<MO_SEQ_CST | ON_UNKNOWN_OOP_REF>::oop_store_at(p, offset, x);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jobject, Unsafe_GetUncompressedObject(JNIEnv *env, jobject unsafe, jlong addr)) {
    oop v = *(oop*) (address) addr;
!   return JNIHandles::make_local(env, v);
  } UNSAFE_END
  
  #define DEFINE_GETSETOOP(java_type, Type) \
   \
  UNSAFE_ENTRY(java_type, Unsafe_Get##Type(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) { \
--- 289,299 ----
    HeapAccess<MO_SEQ_CST | ON_UNKNOWN_OOP_REF>::oop_store_at(p, offset, x);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jobject, Unsafe_GetUncompressedObject(JNIEnv *env, jobject unsafe, jlong addr)) {
    oop v = *(oop*) (address) addr;
!   return JNIHandles::make_local(THREAD, v);
  } UNSAFE_END
  
  #define DEFINE_GETSETOOP(java_type, Type) \
   \
  UNSAFE_ENTRY(java_type, Unsafe_Get##Type(JNIEnv *env, jobject unsafe, jobject obj, jlong offset)) { \
*** 354,364 ****
  
  ////// Allocation requests
  
  UNSAFE_ENTRY(jobject, Unsafe_AllocateInstance(JNIEnv *env, jobject unsafe, jclass cls)) {
    instanceOop i = InstanceKlass::allocate_instance(JNIHandles::resolve_non_null(cls), CHECK_NULL);
!   return JNIHandles::make_local(env, i);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jlong, Unsafe_AllocateMemory0(JNIEnv *env, jobject unsafe, jlong size)) {
    size_t sz = (size_t)size;
  
--- 354,364 ----
  
  ////// Allocation requests
  
  UNSAFE_ENTRY(jobject, Unsafe_AllocateInstance(JNIEnv *env, jobject unsafe, jclass cls)) {
    instanceOop i = InstanceKlass::allocate_instance(JNIHandles::resolve_non_null(cls), CHECK_NULL);
!   return JNIHandles::make_local(THREAD, i);
  } UNSAFE_END
  
  UNSAFE_ENTRY(jlong, Unsafe_AllocateMemory0(JNIEnv *env, jobject unsafe, jlong size)) {
    size_t sz = (size_t)size;
  
*** 563,573 ****
  
    if ((modifiers & JVM_ACC_STATIC) == 0) {
      THROW_0(vmSymbols::java_lang_IllegalArgumentException());
    }
  
!   return JNIHandles::make_local(env, mirror);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_EnsureClassInitialized0(JNIEnv *env, jobject unsafe, jobject clazz)) {
    assert(clazz != NULL, "clazz must not be NULL");
  
--- 563,573 ----
  
    if ((modifiers & JVM_ACC_STATIC) == 0) {
      THROW_0(vmSymbols::java_lang_IllegalArgumentException());
    }
  
!   return JNIHandles::make_local(THREAD, mirror);
  } UNSAFE_END
  
  UNSAFE_ENTRY(void, Unsafe_EnsureClassInitialized0(JNIEnv *env, jobject unsafe, jobject clazz)) {
    assert(clazz != NULL, "clazz must not be NULL");
  
*** 879,889 ****
    jobject res_jh = NULL;
    u1* temp_alloc = NULL;
  
    InstanceKlass* anon_klass = Unsafe_DefineAnonymousClass_impl(env, host_class, data, cp_patches_jh, &temp_alloc, THREAD);
    if (anon_klass != NULL) {
!     res_jh = JNIHandles::make_local(env, anon_klass->java_mirror());
    }
  
    // try/finally clause:
    FREE_C_HEAP_ARRAY(u1, temp_alloc);
  
--- 879,889 ----
    jobject res_jh = NULL;
    u1* temp_alloc = NULL;
  
    InstanceKlass* anon_klass = Unsafe_DefineAnonymousClass_impl(env, host_class, data, cp_patches_jh, &temp_alloc, THREAD);
    if (anon_klass != NULL) {
!     res_jh = JNIHandles::make_local(THREAD, anon_klass->java_mirror());
    }
  
    // try/finally clause:
    FREE_C_HEAP_ARRAY(u1, temp_alloc);
  
*** 912,922 ****
    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) {
--- 912,922 ----
    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(THREAD, 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) {