Fixes #3040. parameters on non-Ruby method with special arity will NPE

Actually, I fixed this for all ASM-generated invokers. We were using the named versions of rest/opt instead of the anonymous versions. Since native methods have no names associated with the parameters I switched to anon versions.
jruby · Jun 12, 2015 · e1c0f7d · e1c0f7d
1 parent a57eba4
commit e1c0f7d
Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java b/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
@@ -41,6 +41,7 @@
 import org.jruby.exceptions.RaiseException;
 import org.jruby.lexer.yacc.ISourcePosition;
 import org.jruby.parser.StaticScope;
+import org.jruby.runtime.ArgumentType;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Helpers;
@@ -702,27 +703,27 @@ public DescriptorInfo(List<JavaMethodDescriptor> descs) {
                 int i = 0;
                 for (; i < min; i++) {
                     if (i > 0) descBuilder.append(';');
-                    descBuilder.append("q");
+                    descBuilder.append(ArgumentType.REQ);
                 }
                // variable arity
             } else if (RICH_NATIVE_METHOD_PARAMETERS) {
                 int i = 0;
                 for (; i < min; i++) {
                     if (i > 0) descBuilder.append(';');
-                    descBuilder.append("q");
+                    descBuilder.append(ArgumentType.REQ);
                 }
 
                 for (; i < max; i++) {
                     if (i > 0) descBuilder.append(';');
-                    descBuilder.append("o");
+                    descBuilder.append(ArgumentType.ANONOPT);
                 }
 
                 if (rest) {
                     if (i > 0) descBuilder.append(';');
-                    descBuilder.append("r");
+                    descBuilder.append(ArgumentType.ANONREST);
                 }
             } else {
-                descBuilder.append("r");
+                descBuilder.append(ArgumentType.ANONREST);
             }
 
             parameterDesc = descBuilder.toString();

diff --git a/core/src/main/java/org/jruby/runtime/ArgumentType.java b/core/src/main/java/org/jruby/runtime/ArgumentType.java
@@ -19,6 +19,10 @@ public enum ArgumentType {
     anonrest("rest", "R", true),
     anonkeyrest("keyrest", "N", true);
 
+    public static final String ANONOPT = anonopt.prefix;
+    public static final String ANONREST = anonrest.prefix;
+    public static final String REQ = req.prefix;
+
     ArgumentType(String symbolicName, String prefix, boolean anonymous) {
         this.symbolicName = symbolicName;
         this.prefix = prefix;

diff --git a/spec/regression/GH-3040_spec.rb b/spec/regression/GH-3040_spec.rb
@@ -0,0 +1,7 @@
+require 'rspec'
+
+describe "A native method with no-simple arity should not NPE" do
+  it "an invoker has proper parameters" do
+    [].method(:shuffle).parameters.should eq([[:rest]])
+  end
+end