Remove VarHandle-based field access.

Author: woess

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java

@@ -40,8 +40,6 @@
  */
 package com.oracle.truffle.api.object;
 
-import static com.oracle.truffle.api.object.ObjectStorageOptions.UseVarHandle;
-
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
@@ -205,25 +203,17 @@ protected double getDouble(DynamicObject store, boolean guard) throws Unexpected
      */
     final Object getInternal(DynamicObject store, Shape expectedShape, boolean guard) {
         if (this instanceof ObjectLocation objectLocation) {
-            Object value;
-            done: {
-                Object base;
-                long offset;
-                if (field == null) {
-                    base = getObjectArray(store, guard);
-                    offset = getObjectArrayOffset();
-                } else {
-                    if (UseVarHandle) {
-                        value = field.varHandle().get(store);
-                        break done;
-                    } else {
-                        field.receiverCheck(store);
-                        base = store;
-                        offset = getFieldOffset();
-                    }
-                }
-                value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
+            Object base;
+            long offset;
+            if (field == null) {
+                base = getObjectArray(store, guard);
+                offset = getObjectArrayOffset();
+            } else {
+                field.receiverCheck(store);
+                base = store;
+                offset = getFieldOffset();
             }
+            Object value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
             return CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard);
         } else {
             if (field == null) {
@@ -239,13 +229,8 @@ final Object getInternal(DynamicObject store, Shape expectedShape, boolean guard
                     return ((ConstantLocation) this).get(store, guard);
                 }
             } else {
-                long longValue;
-                if (UseVarHandle) {
-                    longValue = (long) field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
-                }
+                field.receiverCheck(store);
+                long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 if (this instanceof IntLocation) {
                     return (int) longValue;
                 } else if (this instanceof LongLocation) {
@@ -268,13 +253,8 @@ final int getIntInternal(DynamicObject store, Shape expectedShape, boolean guard
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetInt(array, offset, guard, this);
             } else {
-                long longValue;
-                if (UseVarHandle) {
-                    longValue = (long) field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
-                }
+                field.receiverCheck(store);
+                long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 return (int) longValue;
             }
         }
@@ -300,14 +280,8 @@ final long getLongInternal(DynamicObject store, Shape expectedShape, boolean gua
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetLong(array, offset, guard, this);
             } else {
-                long longValue;
-                if (UseVarHandle) {
-                    longValue = (long) field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
-                }
-                return longValue;
+                field.receiverCheck(store);
+                return UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
             }
         }
         return getLongUnexpected(store, expectedShape, guard);
@@ -332,13 +306,8 @@ final double getDoubleInternal(DynamicObject store, Shape expectedShape, boolean
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetDouble(array, offset, guard, this);
             } else {
-                long longValue;
-                if (UseVarHandle) {
-                    longValue = (long) field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
-                }
+                field.receiverCheck(store);
+                long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 return Double.longBitsToDouble(longValue);
             }
         }
@@ -493,14 +462,9 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 base = getObjectArray(receiver, guard);
                 offset = getObjectArrayOffset();
             } else {
-                if (UseVarHandle) {
-                    field.varHandle().set(receiver, value);
-                    return;
-                } else {
-                    field.receiverCheck(receiver);
-                    base = receiver;
-                    offset = getFieldOffset();
-                }
+                field.receiverCheck(receiver);
+                base = receiver;
+                offset = getFieldOffset();
             }
             UnsafeAccess.unsafePutObject(base, offset, value, this);
         } else { // primitive location
@@ -550,13 +514,9 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 assert isConstantLocation() : this;
                 return;
             }
-            if (UseVarHandle) {
-                field.varHandle().set(receiver, longValue);
-            } else {
-                field.receiverCheck(receiver);
-                long offset = getFieldOffset();
-                UnsafeAccess.unsafePutLong(receiver, offset, longValue, this);
-            }
+            field.receiverCheck(receiver);
+            long offset = getFieldOffset();
+            UnsafeAccess.unsafePutLong(receiver, offset, longValue, this);
         }
     }