jruby · May 19, 2015 · May 19, 2015 · May 19, 2015 · May 19, 2015
diff --git a/spec/ruby/language/fixtures/super.rb b/spec/ruby/language/fixtures/super.rb
@@ -391,4 +391,50 @@ def m(x, y, z = 14)
     end
   end
 
+  module ZSuperWithRest
+    class A
+      def m(*args)
+        args
+      end
+
+      def m_modified(*args)
+        args
+      end
+    end
+
+    class B < A
+      def m(*args)
+        super
+      end
+
+      def m_modified(*args)
+        args[1] = 14
+        super
+      end
+    end
+  end
+
+  module ZSuperWithRestAndOthers
+    class A
+      def m(a, b, *args)
+        args
+      end
+
+      def m_modified(a, b, *args)
+        args
+      end
+    end
+
+    class B < A
+      def m(a, b, *args)
+        super
+      end
+
+      def m_modified(a, b, *args)
+        args[1] = 14
+        super
+      end
+    end
+  end
+
 end
diff --git a/spec/ruby/language/super_spec.rb b/spec/ruby/language/super_spec.rb
@@ -162,24 +162,40 @@ def a(arg)
     Super::AnonymousModuleIncludedTwice.new.a([]).should == ["anon", "anon", "non-anon"]
   end
 
-  it "can accept a block but still pass the original arguments" do
+  it "without explicit arguments can accept a block but still pass the original arguments" do
     Super::ZSuperWithBlock::B.new.a.should == 14
   end
 
-  it "passes optional arguments that have a default value" do
+  it "without explicit arguments passes optional arguments that have a default value" do
     Super::ZSuperWithOptional::B.new.m(1, 2).should == 14
   end
 
-  it "passes optional arguments that have a non-default value" do
+  it "without explicit arguments passes optional arguments that have a non-default value" do
     Super::ZSuperWithOptional::B.new.m(1, 2, 3).should == 3
   end
 
-  it "passes optional arguments that have a default value but were modified" do
+  it "without explicit arguments passes optional arguments that have a default value but were modified" do
     Super::ZSuperWithOptional::C.new.m(1, 2).should == 100
   end
 
-  it "passes optional arguments that have a non-default value but were modified" do
+  it "without explicit arguments passes optional arguments that have a non-default value but were modified" do
     Super::ZSuperWithOptional::C.new.m(1, 2, 3).should == 100
   end
 
+  it "without explicit arguments passes rest arguments" do
+    Super::ZSuperWithRest::B.new.m(1, 2, 3).should == [1, 2, 3]
+  end
+
+  it "without explicit arguments passes rest arguments including any modifications" do
+    Super::ZSuperWithRest::B.new.m_modified(1, 2, 3).should == [1, 14, 3]
+  end
+
+  it "without explicit arguments passes arguments and rest arguments" do
+    Super::ZSuperWithRestAndOthers::B.new.m(1, 2, 3, 4, 5).should == [3, 4, 5]
+  end
+
+  it "without explicit arguments passes arguments and rest arguments including any modifications" do
+    Super::ZSuperWithRestAndOthers::B.new.m_modified(1, 2, 3, 4, 5).should == [3, 14, 5]
+  end
+
 end
diff --git a/spec/truffle/tags/language/super_tags.txt b/spec/truffle/tags/language/super_tags.txt
@@ -2,6 +2,7 @@ fails:The super keyword passes along modified rest args when they weren't origin
 fails:The super keyword passes along modified rest args when they were originally empty
 fails:The super keyword raises a RuntimeError when called with implicit arguments from a method defined with define_method
 fails:The super keyword calls method_missing when a superclass method is not found
-fails:The super keyword passes optional arguments that have a default value
-fails:The super keyword passes optional arguments that have a default value but were modified
-fails:The super keyword passes optional arguments that have a non-default value but were modified
+fails:The super keyword without explicit arguments passes rest arguments
+fails:The super keyword without explicit arguments passes rest arguments including any modifications
+fails:The super keyword without explicit arguments passes arguments and rest arguments
+fails:The super keyword without explicit arguments passes arguments and rest arguments including any modifications
diff --git a/spec/truffle/tags/library/set/sortedset/classify_tags.txt b/spec/truffle/tags/library/set/sortedset/classify_tags.txt
@@ -0,0 +1,3 @@
+fails:SortedSet#classify yields each Object in self in sorted order
+fails:SortedSet#classify returns an Enumerator when passed no block
+fails:SortedSet#classify classifies the Objects in self based on the block's return value
diff --git a/spec/truffle/tags/library/set/sortedset/collect_tags.txt b/spec/truffle/tags/library/set/sortedset/collect_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#collect! yields each Object in self in sorted order
diff --git a/spec/truffle/tags/library/set/sortedset/constructor_tags.txt b/spec/truffle/tags/library/set/sortedset/constructor_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet[] returns a new SortedSet populated with the passed Objects
diff --git a/spec/truffle/tags/library/set/sortedset/delete_if_tags.txt b/spec/truffle/tags/library/set/sortedset/delete_if_tags.txt
@@ -0,0 +1,3 @@
+fails:SortedSet#delete_if yields each Object in self in sorted order
+fails:SortedSet#delete_if deletes every element from self for which the passed block returns true
+fails:SortedSet#delete_if returns an Enumerator when passed no block
diff --git a/spec/truffle/tags/library/set/sortedset/delete_tags.txt b/spec/truffle/tags/library/set/sortedset/delete_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#delete? returns self when the passed Object is in self
diff --git a/spec/truffle/tags/library/set/sortedset/divide_tags.txt b/spec/truffle/tags/library/set/sortedset/divide_tags.txt
@@ -1,2 +1,4 @@
 fails:SortedSet#divide when passed a block with an arity of 2 divides self into a set of subsets based on the blocks return values
 fails:SortedSet#divide when passed a block with an arity of 2 yields each two Objects to the block
+fails:SortedSet#divide divides self into a set of subsets based on the blocks return values
+fails:SortedSet#divide yields each Object in self in sorted order
diff --git a/spec/truffle/tags/library/set/sortedset/each_tags.txt b/spec/truffle/tags/library/set/sortedset/each_tags.txt
@@ -0,0 +1,2 @@
+fails:SortedSet#each yields each Object in self in sorted order
+fails:SortedSet#each returns an Enumerator when not passed a block
diff --git a/spec/truffle/tags/library/set/sortedset/empty_tags.txt b/spec/truffle/tags/library/set/sortedset/empty_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#empty? returns true if self is empty
diff --git a/spec/truffle/tags/library/set/sortedset/eql_tags.txt b/spec/truffle/tags/library/set/sortedset/eql_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#eql? returns true when the passed argument is a SortedSet and contains the same elements
diff --git a/spec/truffle/tags/library/set/sortedset/equal_value_tags.txt b/spec/truffle/tags/library/set/sortedset/equal_value_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#== returns true when the passed Object is a SortedSet and self and the Object contain the same elements
diff --git a/spec/truffle/tags/library/set/sortedset/exclusion_tags.txt b/spec/truffle/tags/library/set/sortedset/exclusion_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#^ returns a new SortedSet containing elements that are not in both self and the passed Enumberable
diff --git a/spec/truffle/tags/library/set/sortedset/flatten_tags.txt b/spec/truffle/tags/library/set/sortedset/flatten_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#flatten! returns self when self was modified
diff --git a/spec/truffle/tags/library/set/sortedset/hash_tags.txt b/spec/truffle/tags/library/set/sortedset/hash_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#hash is static
diff --git a/spec/truffle/tags/library/set/sortedset/include_tags.txt b/spec/truffle/tags/library/set/sortedset/include_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#include? returns true when self contains the passed Object
diff --git a/spec/truffle/tags/library/set/sortedset/initialize_tags.txt b/spec/truffle/tags/library/set/sortedset/initialize_tags.txt
@@ -0,0 +1,2 @@
+fails:SortedSet#initialize adds all elements of the passed Enumerable to self
+fails:SortedSet#initialize preprocesses all elements by a passed block before adding to self
diff --git a/spec/truffle/tags/library/set/sortedset/keep_if_tags.txt b/spec/truffle/tags/library/set/sortedset/keep_if_tags.txt
@@ -0,0 +1,3 @@
+fails:SortedSet#keep_if yields each Object in self in sorted order
+fails:SortedSet#keep_if keeps every element from self for which the passed block returns true
+fails:SortedSet#keep_if returns an Enumerator when passed no block
diff --git a/spec/truffle/tags/library/set/sortedset/length_tags.txt b/spec/truffle/tags/library/set/sortedset/length_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#length returns the number of elements in the set
diff --git a/spec/truffle/tags/library/set/sortedset/map_tags.txt b/spec/truffle/tags/library/set/sortedset/map_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#map! yields each Object in self in sorted order
diff --git a/spec/truffle/tags/library/set/sortedset/member_tags.txt b/spec/truffle/tags/library/set/sortedset/member_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#member? returns true when self contains the passed Object
diff --git a/spec/truffle/tags/library/set/sortedset/merge_tags.txt b/spec/truffle/tags/library/set/sortedset/merge_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#merge adds the elements of the passed Enumerable to self
diff --git a/spec/truffle/tags/library/set/sortedset/plus_tags.txt b/spec/truffle/tags/library/set/sortedset/plus_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#+ returns a new SortedSet containing all elements of self and the passed Enumerable
diff --git a/spec/truffle/tags/library/set/sortedset/pretty_print_cycle_tags.txt b/spec/truffle/tags/library/set/sortedset/pretty_print_cycle_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#pretty_print_cycle passes the 'pretty print' representation of a self-referencing SortedSet to the pretty print writer
diff --git a/spec/truffle/tags/library/set/sortedset/proper_subset_tags.txt b/spec/truffle/tags/library/set/sortedset/proper_subset_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#proper_subset? returns true if passed a SortedSet that self is a proper subset of
diff --git a/spec/truffle/tags/library/set/sortedset/proper_superset_tags.txt b/spec/truffle/tags/library/set/sortedset/proper_superset_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#proper_superset? returns true if passed a SortedSet that self is a proper superset of
diff --git a/spec/truffle/tags/library/set/sortedset/reject_tags.txt b/spec/truffle/tags/library/set/sortedset/reject_tags.txt
@@ -0,0 +1,4 @@
+fails:SortedSet#reject! yields each Object in self in sorted order
+fails:SortedSet#reject! deletes every element from self for which the passed block returns true
+fails:SortedSet#reject! returns self when self was modified
+fails:SortedSet#reject! returns an Enumerator when passed no block
diff --git a/spec/truffle/tags/library/set/sortedset/replace_tags.txt b/spec/truffle/tags/library/set/sortedset/replace_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#replace accepts any enumerable as other
diff --git a/spec/truffle/tags/library/set/sortedset/select_tags.txt b/spec/truffle/tags/library/set/sortedset/select_tags.txt
@@ -0,0 +1,4 @@
+fails:SortedSet#select! yields each Object in self in sorted order
+fails:SortedSet#select! keeps every element from self for which the passed block returns true
+fails:SortedSet#select! returns self when self was modified
+fails:SortedSet#select! returns an Enumerator when passed no block
diff --git a/spec/truffle/tags/library/set/sortedset/size_tags.txt b/spec/truffle/tags/library/set/sortedset/size_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#size returns the number of elements in the set
diff --git a/spec/truffle/tags/library/set/sortedset/subset_tags.txt b/spec/truffle/tags/library/set/sortedset/subset_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#subset? returns true if passed a SortedSet that is equal to self or self is a subset of
diff --git a/spec/truffle/tags/library/set/sortedset/superset_tags.txt b/spec/truffle/tags/library/set/sortedset/superset_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#superset? returns true if passed a SortedSet that equals self or self is a proper superset of
diff --git a/spec/truffle/tags/library/set/sortedset/to_a_tags.txt b/spec/truffle/tags/library/set/sortedset/to_a_tags.txt
@@ -0,0 +1 @@
+fails:SortedSet#to_a returns an array containing elements of self
diff --git a/spec/truffle/tags/library/set/sortedset/union_tags.txt b/spec/truffle/tags/library/set/sortedset/union_tags.txt
@@ -0,0 +1,2 @@
+fails:SortedSet#union returns a new SortedSet containing all elements of self and the passed Enumerable
+fails:SortedSet#| returns a new SortedSet containing all elements of self and the passed Enumerable
diff --git a/spec/truffle/tags/library/thread/sizedqueue/deq_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/deq_tags.txt
@@ -0,0 +1 @@
+fails:Thread::SizedQueue#deq raises a ThreadError if Queue is empty
diff --git a/spec/truffle/tags/library/thread/sizedqueue/pop_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/pop_tags.txt
@@ -0,0 +1 @@
+fails:Thread::SizedQueue#pop raises a ThreadError if Queue is empty
diff --git a/spec/truffle/tags/library/thread/sizedqueue/shift_tags.txt b/spec/truffle/tags/library/thread/sizedqueue/shift_tags.txt
@@ -0,0 +1 @@
+fails:Thread::SizedQueue#shift raises a ThreadError if Queue is empty
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/arguments/WritePreArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/arguments/WritePreArgumentNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
@@ -31,6 +31,14 @@ public final class SequenceNode extends RubyNode {
 
     @Children private final RubyNode[] body;
 
+    public static RubyNode sequenceNoFlatten(RubyContext context, SourceSection sourceSection, RubyNode... sequence) {
+        return new SequenceNode(context, sourceSection, sequence);
+    }
+
+    public static RubyNode sequenceNoFlatten(RubyContext context, SourceSection sourceSection, List<RubyNode> sequence) {
+        return sequenceNoFlatten(context, sourceSection, sequence.toArray(new RubyNode[sequence.size()]));
+    }
+
     public static RubyNode sequence(RubyContext context, SourceSection sourceSection, RubyNode... sequence) {
         return sequence(context, sourceSection, Arrays.asList(sequence));
     }
@@ -93,4 +101,7 @@ public void executeVoid(VirtualFrame frame) {
         }
     }
 
+    public RubyNode[] getSequence() {
+        return body;
+    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -960,16 +960,19 @@ public RubyProc proc(RubyProc block) {
         }
     }
 
-    @CoreMethod(names = "load", isModuleFunction = true, required = 1)
+    @CoreMethod(names = "load", isModuleFunction = true, required = 1, optional = 1)
     public abstract static class LoadNode extends CoreMethodArrayArgumentsNode {
 
         public LoadNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
+        @TruffleBoundary
         @Specialization
-        public boolean load(RubyString file) {
-            CompilerDirectives.transferToInterpreter();
+        public boolean load(RubyString file, boolean wrap) {
+            if (wrap) {
+                throw new UnsupportedOperationException();
+            }
 
             try {
                 getContext().loadFile(file.toString(), this);
@@ -986,6 +989,11 @@ public boolean load(RubyString file) {
 
             return true;
         }
+
+        @Specialization
+        public boolean load(RubyString file, UndefinedPlaceholder wrap) {
+            return load(file, false);
+        }
     }
 
     @CoreMethod(names = "local_variables", needsSelf = false)

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
@@ -11,30 +11,29 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
-
-import java.util.Arrays;
+import org.jruby.truffle.runtime.core.RubyProc;
 
 public class GeneralSuperReCallNode extends AbstractGeneralSuperCallNode {
 
     private final boolean inBlock;
-    @Child private RubyNode reload;
+    @Children private final RubyNode[] reloadNodes;
     @Child private RubyNode block;
 
-    public GeneralSuperReCallNode(RubyContext context, SourceSection sourceSection, boolean inBlock, RubyNode reload, RubyNode block) {
+    public GeneralSuperReCallNode(RubyContext context, SourceSection sourceSection, boolean inBlock, RubyNode[] reloadNodes, RubyNode block) {
         super(context, sourceSection);
         this.inBlock = inBlock;
-        this.reload = reload;
+        this.reloadNodes = reloadNodes;
         this.block = block;
     }
 
+    @ExplodeLoop
     @Override
     public final Object execute(VirtualFrame frame) {
-        reload.execute(frame);
-
         final Object self = RubyArguments.getSelf(frame.getArguments());
 
         if (!guard(frame, self)) {
@@ -50,21 +49,30 @@ public final Object execute(VirtualFrame frame) {
             originalArguments = frame.getArguments();
         }
 
-        final Object[] superArguments = Arrays.copyOf(originalArguments, originalArguments.length);
+        final Object[] superArguments = new Object[reloadNodes.length];
+
+        for (int n = 0; n < superArguments.length; n++) {
+            superArguments[n] = reloadNodes[n].execute(frame);
+        }
+
+        Object blockObject;
 
         if (block != null) {
-            Object blockObject = block.execute(frame);
+            blockObject = block.execute(frame);
 
             if (blockObject == nil()) {
                 blockObject = null;
             }
-
-            superArguments[RubyArguments.BLOCK_INDEX] = blockObject;
+        } else {
+            blockObject = RubyArguments.getBlock(originalArguments);
         }
 
-        superArguments[RubyArguments.METHOD_INDEX] = superMethod;
-
-        return callNode.call(frame, superArguments);
+        return callNode.call(frame, RubyArguments.pack(
+                superMethod,
+                RubyArguments.getDeclarationFrame(originalArguments),
+                RubyArguments.getSelf(originalArguments),
+                (RubyProc) blockObject,
+                superArguments));
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
@@ -284,8 +284,11 @@ public RubyNode visitZSuperNode(org.jruby.ast.ZSuperNode node) {
             blockNode = null;
         }
 
+        final SequenceNode reloadSequence = (SequenceNode) new ReloadArgumentsTranslator(
+                currentNode, context, source, this).visitArgsNode(argsNode);
+
         return new GeneralSuperReCallNode(context, sourceSection, environment.isBlock(),
-                new ReloadArgumentsTranslator(currentNode, context, source, this).visitArgsNode(argsNode),
+                reloadSequence.getSequence(),
                 blockNode);
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#collect! yields each Object in self in sorted order
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet[] returns a new SortedSet populated with the passed Objects
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#delete? returns self when the passed Object is in self
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:SortedSet#each yields each Object in self in sorted order
		fails:SortedSet#each returns an Enumerator when not passed a block
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#empty? returns true if self is empty
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#eql? returns true when the passed argument is a SortedSet and contains the same elements
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#== returns true when the passed Object is a SortedSet and self and the Object contain the same elements
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#^ returns a new SortedSet containing elements that are not in both self and the passed Enumberable
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#flatten! returns self when self was modified
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:SortedSet#include? returns true when self contains the passed Object