Move VarHandle fences to unreachable intrinsics.
These were erroneously moved to unimplemented intrinsics in
https://android-review.googlesource.com/1372099 .
Test: m
Bug: 71781600
Change-Id: Ic348ec1be92e7db8722575dd44f22826e770cc75
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h
index 96f178e..48a1035 100644
--- a/compiler/optimizing/intrinsics.h
+++ b/compiler/optimizing/intrinsics.h
@@ -285,7 +285,12 @@
UNREACHABLE_INTRINSIC(Arch, StringLength) \
UNREACHABLE_INTRINSIC(Arch, UnsafeLoadFence) \
UNREACHABLE_INTRINSIC(Arch, UnsafeStoreFence) \
-UNREACHABLE_INTRINSIC(Arch, UnsafeFullFence)
+UNREACHABLE_INTRINSIC(Arch, UnsafeFullFence) \
+UNREACHABLE_INTRINSIC(Arch, VarHandleFullFence) \
+UNREACHABLE_INTRINSIC(Arch, VarHandleAcquireFence) \
+UNREACHABLE_INTRINSIC(Arch, VarHandleReleaseFence) \
+UNREACHABLE_INTRINSIC(Arch, VarHandleLoadLoadFence) \
+UNREACHABLE_INTRINSIC(Arch, VarHandleStoreStoreFence)
template <typename IntrinsicLocationsBuilder, typename Codegenerator>
bool IsCallFreeIntrinsic(HInvoke* invoke, Codegenerator* codegen) {
diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc
index 4521c80..864a9e3 100644
--- a/compiler/optimizing/intrinsics_arm64.cc
+++ b/compiler/optimizing/intrinsics_arm64.cc
@@ -4487,11 +4487,6 @@
UNIMPLEMENTED_INTRINSIC(ARM64, UnsafeGetAndSetLong)
UNIMPLEMENTED_INTRINSIC(ARM64, UnsafeGetAndSetObject)
-UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleFullFence)
-UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleAcquireFence)
-UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleReleaseFence)
-UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleLoadLoadFence)
-UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleStoreStoreFence)
UNIMPLEMENTED_INTRINSIC(ARM64, MethodHandleInvokeExact)
UNIMPLEMENTED_INTRINSIC(ARM64, MethodHandleInvoke)
UNIMPLEMENTED_INTRINSIC(ARM64, VarHandleGetAndAdd)
diff --git a/compiler/optimizing/intrinsics_arm_vixl.cc b/compiler/optimizing/intrinsics_arm_vixl.cc
index f629ad3..4791245 100644
--- a/compiler/optimizing/intrinsics_arm_vixl.cc
+++ b/compiler/optimizing/intrinsics_arm_vixl.cc
@@ -3150,11 +3150,6 @@
UNIMPLEMENTED_INTRINSIC(ARMVIXL, UnsafeGetAndSetLong)
UNIMPLEMENTED_INTRINSIC(ARMVIXL, UnsafeGetAndSetObject)
-UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleFullFence)
-UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleAcquireFence)
-UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleReleaseFence)
-UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleLoadLoadFence)
-UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleStoreStoreFence)
UNIMPLEMENTED_INTRINSIC(ARMVIXL, MethodHandleInvokeExact)
UNIMPLEMENTED_INTRINSIC(ARMVIXL, MethodHandleInvoke)
UNIMPLEMENTED_INTRINSIC(ARMVIXL, VarHandleCompareAndExchange)
diff --git a/compiler/optimizing/intrinsics_x86.cc b/compiler/optimizing/intrinsics_x86.cc
index 63f5022..4dbf3d9 100644
--- a/compiler/optimizing/intrinsics_x86.cc
+++ b/compiler/optimizing/intrinsics_x86.cc
@@ -4602,11 +4602,6 @@
UNIMPLEMENTED_INTRINSIC(X86, UnsafeGetAndSetLong)
UNIMPLEMENTED_INTRINSIC(X86, UnsafeGetAndSetObject)
-UNIMPLEMENTED_INTRINSIC(X86, VarHandleFullFence)
-UNIMPLEMENTED_INTRINSIC(X86, VarHandleAcquireFence)
-UNIMPLEMENTED_INTRINSIC(X86, VarHandleReleaseFence)
-UNIMPLEMENTED_INTRINSIC(X86, VarHandleLoadLoadFence)
-UNIMPLEMENTED_INTRINSIC(X86, VarHandleStoreStoreFence)
UNIMPLEMENTED_INTRINSIC(X86, MethodHandleInvokeExact)
UNIMPLEMENTED_INTRINSIC(X86, MethodHandleInvoke)
diff --git a/compiler/optimizing/intrinsics_x86_64.cc b/compiler/optimizing/intrinsics_x86_64.cc
index c22fdd9..73010af 100644
--- a/compiler/optimizing/intrinsics_x86_64.cc
+++ b/compiler/optimizing/intrinsics_x86_64.cc
@@ -2817,11 +2817,6 @@
UNIMPLEMENTED_INTRINSIC(X86_64, UnsafeGetAndSetLong)
UNIMPLEMENTED_INTRINSIC(X86_64, UnsafeGetAndSetObject)
-UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleFullFence)
-UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleAcquireFence)
-UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleReleaseFence)
-UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleLoadLoadFence)
-UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleStoreStoreFence)
UNIMPLEMENTED_INTRINSIC(X86_64, MethodHandleInvokeExact)
UNIMPLEMENTED_INTRINSIC(X86_64, MethodHandleInvoke)
UNIMPLEMENTED_INTRINSIC(X86_64, VarHandleCompareAndExchange)