Simplify two fallback guards

hpi-swa · Oct 20, 2024 · 0477bc6 · 0477bc6
1 parent 05c6c76
commit 0477bc6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java b/....hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/Float64ArrayPlugin.java
@@ -22,11 +22,11 @@
 import de.hpi.swa.trufflesqueak.model.NativeObject;
 import de.hpi.swa.trufflesqueak.model.NilObject;
 import de.hpi.swa.trufflesqueak.model.PointersObject;
+import de.hpi.swa.trufflesqueak.nodes.SqueakGuards;
 import de.hpi.swa.trufflesqueak.nodes.accessing.AbstractPointersObjectNodes;
 import de.hpi.swa.trufflesqueak.nodes.primitives.AbstractPrimitiveFactoryHolder;
 import de.hpi.swa.trufflesqueak.nodes.primitives.AbstractPrimitiveNode;
 import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.BinaryPrimitiveFallback;
-import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.TernaryPrimitiveFallback;
 import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.UnaryPrimitiveFallback;
 import de.hpi.swa.trufflesqueak.nodes.primitives.SqueakPrimitive;
 
@@ -80,7 +80,7 @@ protected static final double doAt(final NativeObject receiver, final long index
 
     @GenerateNodeFactory
     @SqueakPrimitive(names = "primitiveAtPut")
-    public abstract static class PrimFloat64ArrayAtPutNode extends AbstractPrimitiveNode implements TernaryPrimitiveFallback {
+    public abstract static class PrimFloat64ArrayAtPutNode extends AbstractPrimitiveNode {
 
         @Specialization(guards = {"receiver.isLongType()", "index <= receiver.getLongLength()"})
         protected static final double doDouble(final NativeObject receiver, final long index, final double value) {
@@ -104,6 +104,18 @@ protected static final double doFraction(final NativeObject receiver, final long
                         @Cached final AbstractPointersObjectNodes.AbstractPointersObjectReadNode readNode) {
             return doDouble(receiver, index, getContext(node).fromFraction(value, readNode, node));
         }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = "isFallback(node, receiver, index, value)")
+        protected static final Object doFail(final NativeObject receiver, final long index, final Object value,
+                        @Bind("this") final Node node) {
+            throw PrimitiveFailed.GENERIC_ERROR;
+        }
+
+        protected static final boolean isFallback(final Node node, final NativeObject receiver, final long index, final Object value) {
+            return !(receiver.isIntType() && index <= receiver.getIntLength() && (value instanceof Double || value instanceof FloatObject || value instanceof Long ||
+                            (value instanceof PointersObject pointersObject && SqueakGuards.isFraction(pointersObject, node))));
+        }
     }
 
     @GenerateNodeFactory

diff --git a/...de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java b/...de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/FloatArrayPlugin.java
@@ -22,11 +22,11 @@
 import de.hpi.swa.trufflesqueak.model.NativeObject;
 import de.hpi.swa.trufflesqueak.model.NilObject;
 import de.hpi.swa.trufflesqueak.model.PointersObject;
+import de.hpi.swa.trufflesqueak.nodes.SqueakGuards;
 import de.hpi.swa.trufflesqueak.nodes.accessing.AbstractPointersObjectNodes;
 import de.hpi.swa.trufflesqueak.nodes.primitives.AbstractPrimitiveFactoryHolder;
 import de.hpi.swa.trufflesqueak.nodes.primitives.AbstractPrimitiveNode;
 import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.BinaryPrimitiveFallback;
-import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.TernaryPrimitiveFallback;
 import de.hpi.swa.trufflesqueak.nodes.primitives.PrimitiveFallbacks.UnaryPrimitiveFallback;
 import de.hpi.swa.trufflesqueak.nodes.primitives.SqueakPrimitive;
 
@@ -81,7 +81,7 @@ protected static final double doAt(final NativeObject receiver, final long index
 
     @GenerateNodeFactory
     @SqueakPrimitive(names = "primitiveAtPut")
-    public abstract static class PrimFloatArrayAtPutNode extends AbstractPrimitiveNode implements TernaryPrimitiveFallback {
+    public abstract static class PrimFloatArrayAtPutNode extends AbstractPrimitiveNode {
 
         @Specialization(guards = {"receiver.isIntType()", "index <= receiver.getIntLength()"})
         protected static final double doDouble(final NativeObject receiver, final long index, final double value) {
@@ -105,6 +105,18 @@ protected static final double doFraction(final NativeObject receiver, final long
                         @Cached final AbstractPointersObjectNodes.AbstractPointersObjectReadNode readNode) {
             return doDouble(receiver, index, getContext(node).fromFraction(value, readNode, node));
         }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = "isFallback(node, receiver, index, value)")
+        protected static final Object doFail(final NativeObject receiver, final long index, final Object value,
+                        @Bind("this") final Node node) {
+            throw PrimitiveFailed.GENERIC_ERROR;
+        }
+
+        protected static final boolean isFallback(final Node node, final NativeObject receiver, final long index, final Object value) {
+            return !(receiver.isIntType() && index <= receiver.getIntLength() && (value instanceof Double || value instanceof FloatObject || value instanceof Long ||
+                            (value instanceof PointersObject pointersObject && SqueakGuards.isFraction(pointersObject, node))));
+        }
     }
 
     @GenerateNodeFactory