Ensure anonymous args get anon form of ArgType. Fixes ##3086.

jruby · Jul 7, 2015 · 5e4d2f8 · 5e4d2f8
1 parent a5b4bbc
commit 5e4d2f8
Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java b/core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
@@ -16,6 +16,7 @@ public class ArgumentDescriptor {
     public static final ArgumentDescriptor[] EMPTY_ARRAY = new ArgumentDescriptor[0];
 
     public ArgumentDescriptor(ArgumentType type, String name) {
+        assert name != null || type.anonymous : "null argument name given for non-anonymous argument type";
         this.type = type;
         this.name = name;
     }

diff --git a/core/src/main/java/org/jruby/runtime/ArgumentType.java b/core/src/main/java/org/jruby/runtime/ArgumentType.java
@@ -52,7 +52,18 @@ public String renderPrefixForm(String name) {
     }
 
     public RubyArray toArrayForm(Ruby runtime, String name) {
-        return anonymous ? runtime.newArray(runtime.newSymbol(symbolicName)) : runtime.newArray(runtime.newSymbol(symbolicName), runtime.newSymbol(name));
+        // we check for null name here as a precaution, since it will certainly blow up newSymbol (#3086)
+        return anonymous || name == null ? runtime.newArray(runtime.newSymbol(symbolicName)) : runtime.newArray(runtime.newSymbol(symbolicName), runtime.newSymbol(name));
+    }
+
+    public ArgumentType anonymousForm() {
+        switch (this) {
+            case opt: return anonopt;
+            case req: return anonreq;
+            case rest: return anonrest;
+            case keyrest: return anonkeyrest;
+        }
+        return this;
     }
 
     public final String symbolicName;

diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -2393,7 +2393,7 @@ public static ArgumentDescriptor[] parameterListToArgumentDescriptors(String[] p
             if (param.length() > 1) {
                 parms[i] = new ArgumentDescriptor(type, param.substring(1));
             } else {
-                parms[i] = new ArgumentDescriptor(type);
+                parms[i] = new ArgumentDescriptor(type.anonymousForm());
             }
         }
 

diff --git a/spec/regression/GH-3086_anon_args_in_to_proc_parameters_spec.rb b/spec/regression/GH-3086_anon_args_in_to_proc_parameters_spec.rb
@@ -0,0 +1,6 @@
+describe 'A method with anonymous required arguments' do
+  it 'can to_proc and produce parameters without error' do
+    # anonymous required args built wrong, caused NPE (#3086)
+    method(:`).to_proc.parameters.should == [[:req]]
+  end
+end