Use a common read/write for object locations.

Author: woess

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

@@ -206,17 +206,23 @@ 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;
-            if (field == null) {
-                Object array = getObjectArray(store, guard);
-                long offset = getObjectArrayOffset();
-                value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);
-            } else {
-                if (UseVarHandle) {
-                    value = field.varHandle().get(store);
+            done: {
+                Object base;
+                long offset;
+                if (field == null) {
+                    base = getObjectArray(store, guard);
+                    offset = getObjectArrayOffset();
                 } else {
-                    field.receiverCheck(store);
-                    value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);
+                    if (UseVarHandle) {
+                        value = field.varHandle().get(store);
+                        break done;
+                    } else {
+                        field.receiverCheck(store);
+                        base = store;
+                        offset = getFieldOffset();
+                    }
                 }
+                value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
             }
             return CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard);
         } else {
@@ -526,19 +532,22 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 objectLocation.invalidateTypeAssumption(value);
             }
+            Object base;
+            long offset;
             if (field == null) {
-                Object array = getObjectArray(receiver, guard);
-                long offset = getObjectArrayOffset();
-                UnsafeAccess.unsafePutObject(array, offset, value, this);
+                base = getObjectArray(receiver, guard);
+                offset = getObjectArrayOffset();
             } else {
                 if (UseVarHandle) {
                     field.varHandle().set(receiver, value);
+                    return;
                 } else {
                     field.receiverCheck(receiver);
-                    long offset = getFieldOffset();
-                    UnsafeAccess.unsafePutObject(receiver, offset, value, this);
+                    base = receiver;
+                    offset = getFieldOffset();
                 }
             }
+            UnsafeAccess.unsafePutObject(base, offset, value, this);
         } else { // primitive location
             long longValue;
             if (isIntLocation()) {