Make JIT not crash on simple method.parameters involving kwargs and r…

…eturn proper values
jruby · Apr 7, 2015 · 0bab673 · 0bab673
1 parent a2ae622
commit 0bab673
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -2765,6 +2765,7 @@ public static RubyArray parameterListToParameters(Ruby runtime, String[] paramet
         RubyArray parms = RubyArray.newEmptyArray(runtime);
 
         for (String param : parameterList) {
+            if (param == null) continue; // FIXME: How does this happen?
             if (param.equals("NONE")) break;
 
             RubyArray elem = RubyArray.newEmptyArray(runtime);
@@ -2822,8 +2823,13 @@ public static String[] irMethodArgsToParameters(String[] argDesc) {
             String type = argDesc[i];
             i++;
             String name = argDesc[i];
-            String encoded = type.charAt(0) + name;
-            tmp[i] = encoded;
+            if (type.equals("keyreq")) {
+                tmp[i] = "K" + name;
+            } else if (type.equals("keyrest")) {
+                tmp[i] = "e" + name;
+            } else {
+                tmp[i] = type.charAt(0) + name;
+            }
         }
 
         return tmp;