diff options
| author | 2021-06-18 06:44:07 +0000 | |
|---|---|---|
| committer | 2021-09-24 10:21:16 +0000 | |
| commit | 2f01e8ed55663b73787e079955d890e1ffd2983e (patch) | |
| tree | 804c2a605a0aed384f10ff809d3967afaca568ec /compiler/optimizing/intrinsics.h | |
| parent | 33a312992c86bdc718783496a9d42a18d7b342b0 (diff) | |
Copying sun.misc.Unsafe to jdk.internal.misc
From OpenJDK 10 onward, sun.misc.Unsafe has been moved to
jdk.internal.misc. Trying to merge in changes from OpenJDK 11
depends on having jdk.internal.misc.Unsafe available. As
sun.misc.Unsafe is still used throughout libcore code, it cannot
be changed yet, so a copy is made to jdk.internal.misc.Unsafe for
now.
As OpenJDK 11 is merged in and sun.misc.Unsafe references will
disappear, it can be deprecated and eventually made to call into
jdk.internal.misc.Unsafe.
Test: m
Test: art/test/testrunner/testrunner.py -t 004-UnsafeTest
Test: art/test/testrunner/testrunner.py -t 2235-JdkUnsafeTest
Bug: 190470684
Change-Id: I472a9778a1001fbd7c3ecce0dfa58ea6d632f158
Diffstat (limited to 'compiler/optimizing/intrinsics.h')
| -rw-r--r-- | compiler/optimizing/intrinsics.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index 9bc8c5126b..738dac0c4a 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -295,6 +295,9 @@ UNREACHABLE_INTRINSIC(Arch, StringLength) \ UNREACHABLE_INTRINSIC(Arch, UnsafeLoadFence) \ UNREACHABLE_INTRINSIC(Arch, UnsafeStoreFence) \ UNREACHABLE_INTRINSIC(Arch, UnsafeFullFence) \ +UNREACHABLE_INTRINSIC(Arch, JdkUnsafeLoadFence) \ +UNREACHABLE_INTRINSIC(Arch, JdkUnsafeStoreFence) \ +UNREACHABLE_INTRINSIC(Arch, JdkUnsafeFullFence) \ UNREACHABLE_INTRINSIC(Arch, VarHandleFullFence) \ UNREACHABLE_INTRINSIC(Arch, VarHandleAcquireFence) \ UNREACHABLE_INTRINSIC(Arch, VarHandleReleaseFence) \ |