Hoist index read.

Author: woess

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

@@ -202,23 +202,26 @@ protected double getDouble(DynamicObject store, boolean guard) throws Unexpected
      * @return the read value
      */
     final Object getInternal(DynamicObject store, Shape expectedShape, boolean guard) {
+        long idx = Integer.toUnsignedLong(index);
         if (this instanceof ObjectLocation objectLocation) {
             Object base;
             long offset;
+            Object value;
             if (field == null) {
                 base = getObjectArray(store, guard);
-                offset = getObjectArrayOffset();
+                offset = computeObjectArrayOffset(idx);
+                value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
             } else {
                 field.receiverCheck(store);
                 base = store;
                 offset = getFieldOffset();
+                value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
             }
-            Object value = UnsafeAccess.unsafeGetObject(base, offset, guard, this);
             return CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard);
         } else {
             if (field == null) {
                 Object array = getPrimitiveArray(store, guard);
-                long offset = getPrimitiveArrayOffset();
+                long offset = computePrimitiveArrayOffset(idx);
                 if (isIntLocation()) {
                     return UnsafeAccess.unsafeGetInt(array, offset, guard, this);
                 } else if (isLongLocation()) {
@@ -442,6 +445,7 @@ final void setDoubleSafe(DynamicObject store, double value, boolean guard, boole
      */
     final void setInternal(DynamicObject receiver, Object value, boolean guard, Shape oldShape, Shape newShape) {
         assert canStoreValue(value) : value;
+        long idx = Integer.toUnsignedLong(index);
         boolean init = newShape != oldShape;
         if (init) {
             DynamicObjectSupport.grow(receiver, oldShape, newShape);
@@ -460,20 +464,21 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
             long offset;
             if (field == null) {
                 base = getObjectArray(receiver, guard);
-                offset = getObjectArrayOffset();
+                offset = computeObjectArrayOffset(idx);
+                UnsafeAccess.unsafePutObject(base, offset, value, this);
             } else {
                 field.receiverCheck(receiver);
                 base = receiver;
                 offset = getFieldOffset();
+                UnsafeAccess.unsafePutObject(base, offset, value, this);
             }
-            UnsafeAccess.unsafePutObject(base, offset, value, this);
         } else { // primitive location
             long longValue;
             if (isIntLocation()) {
                 int intValue = (int) value;
                 if (field == null) {
                     Object array = getPrimitiveArray(receiver, guard);
-                    long offset = getPrimitiveArrayOffset();
+                    long offset = computePrimitiveArrayOffset(idx);
                     UnsafeAccess.unsafePutInt(array, offset, intValue, this);
                     return;
                 } else {
@@ -489,7 +494,7 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 }
                 if (field == null) {
                     Object array = getPrimitiveArray(receiver, guard);
-                    long offset = getPrimitiveArrayOffset();
+                    long offset = computePrimitiveArrayOffset(idx);
                     UnsafeAccess.unsafePutLong(array, offset, longValue, this);
                     return;
                 }
@@ -504,7 +509,7 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 }
                 if (field == null) {
                     Object array = getPrimitiveArray(receiver, guard);
-                    long offset = getPrimitiveArrayOffset();
+                    long offset = computePrimitiveArrayOffset(idx);
                     UnsafeAccess.unsafePutDouble(array, offset, doubleValue, this);
                     return;
                 } else {
@@ -745,12 +750,20 @@ final long getFieldOffset() {
         return field.offset();
     }
 
+    static long computeObjectArrayOffset(long index) {
+        return index * Unsafe.ARRAY_OBJECT_INDEX_SCALE + Unsafe.ARRAY_OBJECT_BASE_OFFSET;
+    }
+
+    static long computePrimitiveArrayOffset(long index) {
+        return index * Unsafe.ARRAY_INT_INDEX_SCALE + Unsafe.ARRAY_INT_BASE_OFFSET;
+    }
+
     final long getObjectArrayOffset() {
-        return Integer.toUnsignedLong(index) * Unsafe.ARRAY_OBJECT_INDEX_SCALE + Unsafe.ARRAY_OBJECT_BASE_OFFSET;
+        return computeObjectArrayOffset(Integer.toUnsignedLong(index));
     }
 
     final long getPrimitiveArrayOffset() {
-        return Integer.toUnsignedLong(index) * Unsafe.ARRAY_INT_INDEX_SCALE + Unsafe.ARRAY_INT_BASE_OFFSET;
+        return computePrimitiveArrayOffset(Integer.toUnsignedLong(index));
     }
 
     static Object getObjectArray(DynamicObject store, boolean condition) {