From 2f01e8ed55663b73787e079955d890e1ffd2983e Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Fri, 18 Jun 2021 06:44:07 +0000 Subject: 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 --- compiler/optimizing/instruction_builder.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'compiler/optimizing/instruction_builder.cc') diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 8ec28e0ab1..390a2bb0be 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -1908,14 +1908,17 @@ bool HInstructionBuilder::BuildSimpleIntrinsic(ArtMethod* method, new (allocator_) HArrayLength(/*array=*/ nullptr, dex_pc, /* is_string_length= */ true); break; case Intrinsics::kUnsafeLoadFence: + case Intrinsics::kJdkUnsafeLoadFence: receiver_arg = ReceiverArg::kNullCheckedOnly; instruction = new (allocator_) HMemoryBarrier(MemBarrierKind::kLoadAny, dex_pc); break; case Intrinsics::kUnsafeStoreFence: + case Intrinsics::kJdkUnsafeStoreFence: receiver_arg = ReceiverArg::kNullCheckedOnly; instruction = new (allocator_) HMemoryBarrier(MemBarrierKind::kAnyStore, dex_pc); break; case Intrinsics::kUnsafeFullFence: + case Intrinsics::kJdkUnsafeFullFence: receiver_arg = ReceiverArg::kNullCheckedOnly; instruction = new (allocator_) HMemoryBarrier(MemBarrierKind::kAnyAny, dex_pc); break; -- cgit v1.2.3-59-g8ed1b