Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8252835: Revert fix for JDK-8246051
Reviewed-by: psandoz, dholmes, mikael
  • Loading branch information
Wang Zhuo authored and David Holmes committed Sep 28, 2020
1 parent ca1ed16 commit 276fcee79572de64134625e0d184fc3c99713595
Showing with 0 additions and 83 deletions.
  1. +0 −2 src/hotspot/share/prims/unsafe.cpp
  2. +0 −81 test/hotspot/jtreg/compiler/unsafe/TestUnsafeUnalignedSwap.java
@@ -951,7 +951,6 @@ UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetReference(JNIEnv *env, jobject unsafe

UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetInt(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jint e, jint x)) {
oop p = JNIHandles::resolve(obj);
GuardUnsafeAccess guard(thread);
if (p == NULL) {
volatile jint* addr = (volatile jint*)index_oop_from_field_offset_long(p, offset);
return RawAccess<>::atomic_cmpxchg(addr, e, x) == e;
@@ -963,7 +962,6 @@ UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetInt(JNIEnv *env, jobject unsafe, jobj

UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetLong(JNIEnv *env, jobject unsafe, jobject obj, jlong offset, jlong e, jlong x)) {
oop p = JNIHandles::resolve(obj);
GuardUnsafeAccess guard(thread);
if (p == NULL) {
volatile jlong* addr = (volatile jlong*)index_oop_from_field_offset_long(p, offset);
return RawAccess<>::atomic_cmpxchg(addr, e, x) == e;

This file was deleted.

0 comments on commit 276fcee

Please sign in to comment.