Omit field receiver type check.

Author: woess

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

@@ -42,6 +42,7 @@
 
 import java.lang.invoke.VarHandle;
 import java.lang.reflect.Field;
+import java.util.Objects;
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -158,4 +159,10 @@ private IllegalArgumentException illegalReceiver(DynamicObject store) {
         CompilerAsserts.neverPartOfCompilation();
         return new IllegalArgumentException("Invalid receiver type (expected " + getDeclaringClass() + ", was " + (store == null ? null : store.getClass()) + ")");
     }
+
+    void unsafeReceiverCast(DynamicObject store) {
+        if (ObjectStorageOptions.ReceiverCast) {
+            Objects.requireNonNull(tclass.cast(store));
+        }
+    }
 }

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

@@ -209,7 +209,7 @@ final Object getInternal(DynamicObject store, Shape expectedShape, boolean guard
                 base = getObjectArray(store, guard);
                 offset = getObjectArrayOffset();
             } else {
-                field.receiverCheck(store);
+                field.unsafeReceiverCast(store);
                 base = store;
                 offset = getFieldOffset();
             }
@@ -229,7 +229,7 @@ final Object getInternal(DynamicObject store, Shape expectedShape, boolean guard
                     return ((ConstantLocation) this).get(store, guard);
                 }
             } else {
-                field.receiverCheck(store);
+                field.unsafeReceiverCast(store);
                 long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 if (this instanceof IntLocation) {
                     return (int) longValue;
@@ -253,7 +253,7 @@ final int getIntInternal(DynamicObject store, Shape expectedShape, boolean guard
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetInt(array, offset, guard, this);
             } else {
-                field.receiverCheck(store);
+                field.unsafeReceiverCast(store);
                 long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 return (int) longValue;
             }
@@ -280,7 +280,7 @@ final long getLongInternal(DynamicObject store, Shape expectedShape, boolean gua
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetLong(array, offset, guard, this);
             } else {
-                field.receiverCheck(store);
+                field.unsafeReceiverCast(store);
                 return UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
             }
         }
@@ -306,7 +306,7 @@ final double getDoubleInternal(DynamicObject store, Shape expectedShape, boolean
                 long offset = getPrimitiveArrayOffset();
                 return UnsafeAccess.unsafeGetDouble(array, offset, guard, this);
             } else {
-                field.receiverCheck(store);
+                field.unsafeReceiverCast(store);
                 long longValue = UnsafeAccess.unsafeGetLong(store, getFieldOffset(), guard, this);
                 return Double.longBitsToDouble(longValue);
             }
@@ -462,7 +462,7 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 base = getObjectArray(receiver, guard);
                 offset = getObjectArrayOffset();
             } else {
-                field.receiverCheck(receiver);
+                field.unsafeReceiverCast(receiver);
                 base = receiver;
                 offset = getFieldOffset();
             }
@@ -514,7 +514,7 @@ final void setInternal(DynamicObject receiver, Object value, boolean guard, Shap
                 assert isConstantLocation() : this;
                 return;
             }
-            field.receiverCheck(receiver);
+            field.unsafeReceiverCast(receiver);
             long offset = getFieldOffset();
             UnsafeAccess.unsafePutLong(receiver, offset, longValue, this);
         }

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

@@ -47,6 +47,8 @@ final class ObjectStorageOptions {
     private ObjectStorageOptions() {
     }
 
+    static final boolean ASSERTIONS_ENABLED = assertionsEnabled();
+
     static final boolean PrimitiveLocations = booleanOption(OPTION_PREFIX + "PrimitiveLocations", true);
     static final boolean IntegerLocations = booleanOption(OPTION_PREFIX + "IntegerLocations", true);
     static final boolean DoubleLocations = booleanOption(OPTION_PREFIX + "DoubleLocations", true);
@@ -61,6 +63,10 @@ private ObjectStorageOptions() {
      * If set to true, use VarHandle rather than Unsafe to implement field accesses.
      */
     static final boolean UseVarHandle = booleanOption(OPTION_PREFIX + "UseVarHandle", false);
+    /**
+     * Enforce receiver type checks for unsafe field accesses.
+     */
+    static final boolean ReceiverCast = booleanOption(OPTION_PREFIX + "ReceiverCast", false) || ASSERTIONS_ENABLED;
 
     static final boolean TriePropertyMap = booleanOption(OPTION_PREFIX + "TriePropertyMap", true);
     static final boolean TrieTransitionMap = booleanOption(OPTION_PREFIX + "TrieTransitionMap", true);
@@ -94,4 +100,11 @@ static boolean booleanOption(String name, boolean defaultValue) {
         String value = System.getProperty(name);
         return value == null ? defaultValue : value.equalsIgnoreCase("true");
     }
+
+    @SuppressWarnings("all")
+    private static boolean assertionsEnabled() {
+        boolean enabled = false;
+        assert (enabled = true) == true;
+        return enabled;
+    }
 }