Implement clear() for primitive locations.

Author: woess

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

@@ -51,8 +51,8 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
-
 import com.oracle.truffle.api.impl.AbstractAssumption;
+
 import sun.misc.Unsafe;
 
 /**
@@ -197,6 +197,10 @@ public final void set(DynamicObject store, Object value, boolean guard, boolean
             }
         }
 
+        @Override
+        void clear(DynamicObject store) {
+        }
+
         @Override
         public String toString() {
             return "=" + value;
@@ -637,8 +641,8 @@ private void setObjectInternal(DynamicObject store, Object value, boolean guard)
         }
 
         @Override
-        protected void clear(DynamicObject store) {
-            UnsafeAccess.unsafePutObject(getArray(store, false), getOffset(), null, this);
+        void clear(DynamicObject store) {
+            setObjectInternal(store, null, false);
         }
 
         @Override
@@ -696,8 +700,8 @@ private void setObjectInternal(DynamicObject store, Object value) {
         }
 
         @Override
-        protected void clear(DynamicObject store) {
-            UnsafeAccess.unsafePutObject(store, getOffset(), null, this);
+        void clear(DynamicObject store) {
+            setObjectInternal(store, null);
         }
 
         @Override
@@ -825,6 +829,11 @@ private void setIntInternal(DynamicObject store, int value) {
             UnsafeAccess.unsafePutLong(store, getOffset(), value & 0xffff_ffffL, this);
         }
 
+        @Override
+        protected void clear(DynamicObject store) {
+            setIntInternal(store, 0);
+        }
+
         @Override
         public boolean canStore(Object value) {
             return value instanceof Integer;
@@ -885,6 +894,11 @@ private void setDoubleInternal(DynamicObject store, double value) {
             UnsafeAccess.unsafePutLong(store, getOffset(), Double.doubleToRawLongBits(value), this);
         }
 
+        @Override
+        void clear(DynamicObject store) {
+            setDoubleInternal(store, 0);
+        }
+
         @Override
         protected void set(DynamicObject store, Object value, boolean guard, boolean init) {
             if (canStore(value)) {
@@ -1009,6 +1023,11 @@ public void setInt(DynamicObject store, int value, boolean guard, boolean init)
             setIntInternal(store, value, guard);
         }
 
+        @Override
+        void clear(DynamicObject store) {
+            setIntInternal(store, 0, false);
+        }
+
         @Override
         public boolean canStore(Object value) {
             return value instanceof Integer;
@@ -1076,6 +1095,11 @@ private void setDoubleInternal(DynamicObject store, double value, boolean guard)
             UnsafeAccess.unsafePutDouble(getArray(store, guard), getOffset(), value, this);
         }
 
+        @Override
+        void clear(DynamicObject store) {
+            setDoubleInternal(store, 0, false);
+        }
+
         @Override
         public void setDouble(DynamicObject store, double value, boolean guard, boolean init) {
             if (!init) {
@@ -1164,6 +1188,11 @@ private void setLongInternal(DynamicObject store, long value) {
             UnsafeAccess.unsafePutLong(store, getOffset(), value, this);
         }
 
+        @Override
+        void clear(DynamicObject store) {
+            setLongInternal(store, 0L);
+        }
+
         @Override
         protected void set(DynamicObject store, Object value, boolean guard, boolean init) {
             if (canStore(value)) {
@@ -1260,6 +1289,11 @@ private void setLongInternal(DynamicObject store, long value, boolean guard) {
             UnsafeAccess.unsafePutLong(getArray(store, guard), getOffset(), value, this);
         }
 
+        @Override
+        void clear(DynamicObject store) {
+            setLongInternal(store, 0L, false);
+        }
+
         @Override
         public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
             if (!init) {

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

@@ -40,12 +40,12 @@
  */
 package com.oracle.truffle.api.object;
 
+import java.util.Objects;
+
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 
-import java.util.Objects;
-
 /**
  * Property location.
  *
@@ -416,8 +416,7 @@ Class<?> getType() {
         return null;
     }
 
-    void clear(@SuppressWarnings("unused") DynamicObject store) {
-    }
+    abstract void clear(DynamicObject store);
 
     abstract int getOrdinal();