[GR-26542] Correctly handle post args in super calls.

PullRequest: truffleruby/2049

Author: eregon

spec/ruby/language/fixtures/super.rb

@@ -455,6 +455,52 @@ def m_modified(a, b, *args)
     end
   end
 
+  module ZSuperWithRestAndPost
+    class A
+      def m(*args, a, b)
+        args
+      end
+
+      def m_modified(*args, a, b)
+        args
+      end
+    end
+
+    class B < A
+      def m(*args, a, b)
+        super
+      end
+
+      def m_modified(*args, a, b)
+        args[1] = 14
+        super
+      end
+    end
+  end
+
+  module ZSuperWithRestOthersAndPost
+    class A
+      def m(a, *args, b)
+        args
+      end
+
+      def m_modified(a, *args, b)
+        args
+      end
+    end
+
+    class B < A
+      def m(a, *args, b)
+        super
+      end
+
+      def m_modified(a, *args, b)
+        args[1] = 14
+        super
+      end
+    end
+  end
+
   module ZSuperWithRestReassigned
     class A
       def a(*args)

spec/ruby/language/super_spec.rb

@@ -293,6 +293,21 @@ def obj.foobar(array)
 
   it "without explicit arguments passes arguments and rest arguments" do
     SuperSpecs::ZSuperWithRestAndOthers::B.new.m(1, 2, 3, 4, 5).should == [3, 4, 5]
+    SuperSpecs::ZSuperWithRestAndOthers::B.new.m(1, 2).should == []
+  end
+
+  it "without explicit arguments passes arguments, rest arguments, and post arguments" do
+    SuperSpecs::ZSuperWithRestAndPost::B.new.m(1, 2, 3, 4, 5).should == [1, 2, 3]
+    SuperSpecs::ZSuperWithRestOthersAndPost::B.new.m(1, 2, 3, 4, 5).should == [2, 3, 4]
+    SuperSpecs::ZSuperWithRestAndPost::B.new.m(1, 2).should == []
+    SuperSpecs::ZSuperWithRestOthersAndPost::B.new.m(1, 2).should == []
+  end
+
+  it "without explicit arguments passes arguments, rest arguments including modifications, and post arguments" do
+    SuperSpecs::ZSuperWithRestAndPost::B.new.m_modified(1, 2, 3, 4, 5).should == [1, 14, 3]
+    SuperSpecs::ZSuperWithRestOthersAndPost::B.new.m_modified(1, 2, 3, 4, 5).should == [2, 14, 4]
+    SuperSpecs::ZSuperWithRestAndPost::B.new.m_modified(1, 2).should == [nil, 14]
+    SuperSpecs::ZSuperWithRestOthersAndPost::B.new.m_modified(1, 2).should == [nil, 14]
   end
 
   it "without explicit arguments passes arguments and rest arguments including any modifications" do

src/main/java/org/truffleruby/parser/ReloadArgumentsTranslator.java

@@ -13,7 +13,6 @@
 import java.util.List;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.hash.ConcatHashLiteralNode;
 import org.truffleruby.core.hash.HashLiteralNode;
 import org.truffleruby.language.RubyNode;
@@ -62,8 +61,6 @@ public int getRestParameterIndex() {
 
     @Override
     public RubyNode visitArgsNode(ArgsParseNode node) {
-        final SourceIndexLength sourceSection = node.getPosition();
-
         final List<RubyNode> sequence = new ArrayList<>();
         final ParseNode[] args = node.getArgs();
         final int preCount = node.getPreCount();
@@ -89,11 +86,15 @@ public RubyNode visitArgsNode(ArgsParseNode node) {
             sequence.add(node.getRestArgNode().accept(this));
         }
 
-        if (node.getPostCount() > 0) {
-            RubyLanguage.LOGGER.warning(
-                    String.format(
-                            "post args in zsuper not yet implemented at %s%n",
-                            RubyContext.fileLine(sourceSection.toSourceSection(source))));
+        int postCount = node.getPostCount();
+
+        if (postCount > 0) {
+            index = -postCount;
+            int postIndex = node.getPostIndex();
+            for (int i = 0; i < postCount; i++) {
+                sequence.add(args[postIndex + i].accept(this));
+                index++;
+            }
         }
 
         RubyNode kwArgsNode = null;