[Truffle] Fix last Array language spec!

eregon · eregon · commit 423da52dbdc6 · 2014-12-07T14:28:17.000+01:00
diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
@@ -14,6 +14,8 @@
 import com.oracle.truffle.api.dsl.*;
 import com.oracle.truffle.api.frame.*;
 import org.jruby.truffle.nodes.*;
+import org.jruby.truffle.nodes.core.ArrayDupNode;
+import org.jruby.truffle.nodes.core.ArrayDupNodeFactory;
 import org.jruby.truffle.nodes.dispatch.Dispatch;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.runtime.*;
@@ -34,6 +36,7 @@ public static enum NilBehavior {
 
     private final NilBehavior nilBehavior;
 
+    @Child protected ArrayDupNode dup;
     @Child protected DispatchHeadNode respondToToA;
     @Child protected BooleanCastNode respondToCast;
     @Child protected DispatchHeadNode toA;
@@ -42,13 +45,15 @@ public SplatCastNode(RubyContext context, SourceSection sourceSection, NilBehavi
         super(context, sourceSection);
         this.nilBehavior = nilBehavior;
         // Calling private #to_a is allowed for the *splat operator.
+        dup = ArrayDupNodeFactory.create(context, sourceSection, null);
         respondToToA = new DispatchHeadNode(context, true, Dispatch.MissingBehavior.RETURN_MISSING);
         respondToCast = BooleanCastNodeFactory.create(context, sourceSection, null);
         toA = new DispatchHeadNode(context, true, Dispatch.MissingBehavior.RETURN_MISSING);
     }
 
     public SplatCastNode(SplatCastNode prev) {
         super(prev);
+        dup = prev.dup;
         nilBehavior = prev.nilBehavior;
         respondToToA = prev.respondToToA;
         respondToCast = prev.respondToCast;
@@ -74,8 +79,10 @@ public RubyArray splat(RubyNilClass nil) {
     }
 
     @Specialization
-    public RubyArray splat(RubyArray array) {
-        return array;
+    public RubyArray splat(VirtualFrame frame, RubyArray array) {
+        // TODO(cs): is it necessary to dup here in all cases?
+        // It is needed at least for [*ary] (translated as just a SplatNode) and b = *ary.
+        return dup.executeDup(frame, array);
     }
 
     @Specialization(guards = {"!isRubyNilClass", "!isRubyArray"})
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayDupNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayDupNode.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.nodes.core;
+
+import com.oracle.truffle.api.dsl.ImportGuards;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.NodeChildren;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyArray;
+
+import java.util.Arrays;
+
+/**
+ * Dup an array, without using any method lookup. This isn't a call - it's an operation on a core class.
+ */
+@NodeChildren({@NodeChild(value = "array", type = RubyNode.class)})
+@ImportGuards(ArrayGuards.class)
+public abstract class ArrayDupNode extends RubyNode {
+
+    public ArrayDupNode(RubyContext context, SourceSection sourceSection) {
+        super(context, sourceSection);
+    }
+
+    public ArrayDupNode(ArrayDupNode prev) {
+        super(prev);
+    }
+
+    public abstract RubyArray executeDup(VirtualFrame frame, RubyArray array);
+
+    @Specialization(guards = "isNull")
+    public RubyArray dupNull(RubyArray from) {
+        return new RubyArray(getContext().getCoreLibrary().getArrayClass(), null, 0);
+    }
+
+    @Specialization(guards = "isIntegerFixnum")
+    public RubyArray dupIntegerFixnum(RubyArray from) {
+        return new RubyArray(getContext().getCoreLibrary().getArrayClass(), Arrays.copyOf((int[]) from.getStore(), from.getSize()), from.getSize());
+    }
+
+    @Specialization(guards = "isLongFixnum")
+    public RubyArray dupLongFixnum(RubyArray from) {
+        return new RubyArray(getContext().getCoreLibrary().getArrayClass(), Arrays.copyOf((long[]) from.getStore(), from.getSize()), from.getSize());
+    }
+
+    @Specialization(guards = "isFloat")
+    public RubyArray dupFloat(RubyArray from) {
+        return new RubyArray(getContext().getCoreLibrary().getArrayClass(), Arrays.copyOf((double[]) from.getStore(), from.getSize()), from.getSize());
+    }
+
+    @Specialization(guards = "isObject")
+    public RubyArray dupObject(RubyArray from) {
+        return new RubyArray(getContext().getCoreLibrary().getArrayClass(), Arrays.copyOf((Object[]) from.getStore(), from.getSize()), from.getSize());
+    }
+
+}
diff --git a/spec/truffle/tags/language/array_tags.txt b/spec/truffle/tags/language/array_tags.txt
