jruby · Apr 17, 2016 · Apr 17, 2016 · Apr 17, 2016 · Apr 17, 2016 · Apr 17, 2016
diff --git a/test/truffle/compiler/pe/core/string_pe.rb b/test/truffle/compiler/pe/core/string_pe.rb
@@ -51,4 +51,4 @@
 example "'abc'.getbyte(10_000) == nil", true
 
 example "14.to_s.length", 2
-counter_example "14.to_s.getbyte(0)", '1'.ord # Doesn't work becuase the bytes are only populated on demand and so aren't constant
+counter_example "14.to_s.getbyte(0)" # Doesn't work becuase the bytes are only populated on demand and so aren't constant
diff --git a/truffle/src/main/java/org/jruby/truffle/core/BinaryCoreMethodNode.java b/truffle/src/main/java/org/jruby/truffle/core/BinaryCoreMethodNode.java
@@ -20,6 +20,9 @@
         @NodeChild(value = "right", type = RubyNode.class)})
 public abstract class BinaryCoreMethodNode extends CoreMethodNode {
 
+    public BinaryCoreMethodNode() {
+    }
+
     public BinaryCoreMethodNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodArrayArgumentsNode.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodArrayArgumentsNode.java
@@ -17,6 +17,9 @@
 @NodeChild(value = "arguments", type = RubyNode[].class)
 public abstract class CoreMethodArrayArgumentsNode extends CoreMethodNode {
 
+    public CoreMethodArrayArgumentsNode() {
+    }
+
     public CoreMethodArrayArgumentsNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNode.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNode.java
@@ -17,6 +17,9 @@
 @GenerateNodeFactory
 public abstract class CoreMethodNode extends RubyNode {
 
+    public CoreMethodNode() {
+    }
+
     public CoreMethodNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
@@ -217,9 +217,18 @@ private static RubyRootNode makeGenericMethod(RubyContext context, MethodDetails
         assert signatures.size() == 1;
         List<Class<?>> signature = signatures.get(0);
 
-        if (signature.size() >= 3 && signature.get(2) == RubyNode[].class) {
+        if (signature.size() == 0) {
+            methodNode = nodeFactory.createNode();
+        } else if (signature.size() == 1 && signature.get(0) == RubyNode[].class) {
+            Object[] args = argumentsNodes.toArray(new RubyNode[argumentsNodes.size()]);
+            methodNode = nodeFactory.createNode(new Object[]{args});
+        } else if (signature.size() >= 3 && signature.get(2) == RubyNode[].class) {
             Object[] args = argumentsNodes.toArray(new RubyNode[argumentsNodes.size()]);
             methodNode = nodeFactory.createNode(context, sourceSection, args);
+        } else if (signature.get(0) != RubyContext.class) {
+            Object[] args = new Object[argumentsNodes.size()];
+            System.arraycopy(argumentsNodes.toArray(new RubyNode[argumentsNodes.size()]), 0, args, 0, argumentsNodes.size());
+            methodNode = nodeFactory.createNode(args);
         } else {
             Object[] args = new Object[2 + argumentsNodes.size()];
             args[0] = context;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/MathNodes.java b/truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
@@ -31,10 +31,6 @@ public abstract class MathNodes {
     @CoreMethod(names = "acos", isModuleFunction = true, required = 1)
     public abstract static class ACosNode extends SimpleMonadicMathNode {
 
-        public ACosNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             if (a < -1.0 || a > 1.0) {
@@ -50,10 +46,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "acosh", isModuleFunction = true, required = 1)
     public abstract static class ACosHNode extends SimpleMonadicMathNode {
 
-        public ACosHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             // Copied from RubyMath - see copyright notices there
@@ -75,10 +67,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "asin", isModuleFunction = true, required = 1)
     public abstract static class ASinNode extends SimpleMonadicMathNode {
 
-        public ASinNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             if (a < -1.0 || a > 1.0) {
@@ -94,10 +82,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "asinh", isModuleFunction = true, required = 1)
     public abstract static class ASinHNode extends SimpleMonadicMathNode {
 
-        public ASinHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             // Copied from RubyMath - see copyright notices there
@@ -124,10 +108,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "atan", isModuleFunction = true, required = 1)
     public abstract static class ATanNode extends SimpleMonadicMathNode {
 
-        public ATanNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.atan(a);
@@ -138,10 +118,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "atan2", isModuleFunction = true, required = 2)
     public abstract static class ATan2Node extends SimpleDyadicMathNode {
 
-        public ATan2Node(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a, double b) {
             return Math.atan2(a, b);
@@ -152,10 +128,6 @@ protected double doFunction(double a, double b) {
     @CoreMethod(names = "atanh", isModuleFunction = true, required = 1)
     public abstract static class ATanHNode extends SimpleMonadicMathNode {
 
-        public ATanHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             // Copied from RubyMath - see copyright notices there
@@ -187,10 +159,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "cbrt", isModuleFunction = true, required = 1)
     public abstract static class CbRtNode extends SimpleMonadicMathNode {
 
-        public CbRtNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.cbrt(a);
@@ -201,10 +169,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "cos", isModuleFunction = true, required = 1)
     public abstract static class CosNode extends SimpleMonadicMathNode {
 
-        public CosNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.cos(a);
@@ -215,10 +179,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "cosh", isModuleFunction = true, required = 1)
     public abstract static class CosHNode extends SimpleMonadicMathNode {
 
-        public CosHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.cosh(a);
@@ -229,10 +189,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "erf", isModuleFunction = true, required = 1)
     public abstract static class ErfNode extends SimpleMonadicMathNode {
 
-        public ErfNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             // Copied from RubyMath - see copyright notices there
@@ -257,10 +213,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "erfc", isModuleFunction = true, required = 1)
     public abstract static class ErfcNode extends SimpleMonadicMathNode {
 
-        public ErfcNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         public double doFunction(double a) {
             return erfc(a);
@@ -298,10 +250,6 @@ public static double erfc(double a) {
     @CoreMethod(names = "exp", isModuleFunction = true, required = 1)
     public abstract static class ExpNode extends SimpleMonadicMathNode {
 
-        public ExpNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.exp(a);
@@ -376,10 +324,6 @@ public DynamicObject frexp(VirtualFrame frame, Object a) {
     @CoreMethod(names = "gamma", isModuleFunction = true, required = 1)
     public abstract static class GammaNode extends SimpleMonadicMathNode {
 
-        public GammaNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             // Copied from RubyMath - see copyright notices there
@@ -429,10 +373,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "hypot", isModuleFunction = true, required = 2)
     public abstract static class HypotNode extends SimpleDyadicMathNode {
 
-        public HypotNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a, double b) {
             return Math.hypot(a, b);
@@ -591,10 +531,6 @@ public DynamicObject lgamma(VirtualFrame frame, Object a) {
     @CoreMethod(names = "log", isModuleFunction = true, required = 1, optional = 1)
     public abstract static class LogNode extends SimpleDyadicMathNode {
 
-        public LogNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Specialization
         public double function(int a, NotProvided b) {
             return doFunction(a);
@@ -649,10 +585,6 @@ protected double doFunction(double a, double b) {
     @CoreMethod(names = "log10", isModuleFunction = true, required = 1)
     public abstract static class Log10Node extends SimpleMonadicMathNode {
 
-        public Log10Node(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             if (a < 0) {
@@ -670,10 +602,6 @@ public abstract static class Log2Node extends SimpleMonadicMathNode {
 
         private final double LOG2 = Math.log(2);
 
-        public Log2Node(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             if (a < 0) {
@@ -689,10 +617,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "sin", isModuleFunction = true, required = 1)
     public abstract static class SinNode extends SimpleMonadicMathNode {
 
-        public SinNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.sin(a);
@@ -703,10 +627,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "sinh", isModuleFunction = true, required = 1)
     public abstract static class SinHNode extends SimpleMonadicMathNode {
 
-        public SinHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.sinh(a);
@@ -717,10 +637,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "tan", isModuleFunction = true, required = 1)
     public abstract static class TanNode extends SimpleMonadicMathNode {
 
-        public TanNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.tan(a);
@@ -731,10 +647,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "tanh", isModuleFunction = true, required = 1)
     public abstract static class TanHNode extends SimpleMonadicMathNode {
 
-        public TanHNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.tanh(a);
@@ -745,10 +657,6 @@ protected double doFunction(double a) {
     @CoreMethod(names = "sqrt", isModuleFunction = true, required = 1)
     public abstract static class SqrtNode extends SimpleMonadicMathNode {
 
-        public SqrtNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-        }
-
         @Override
         protected double doFunction(double a) {
             return Math.sqrt(a);
@@ -761,6 +669,10 @@ protected abstract static class SimpleMonadicMathNode extends CoreMethodArrayArg
         @Child private IsANode isANode;
         @Child private CallDispatchHeadNode floatNode;
 
+        protected SimpleMonadicMathNode() {
+            this(null, null);
+        }
+
         protected SimpleMonadicMathNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
             isANode = IsANodeGen.create(context, sourceSection, null, null);
@@ -811,6 +723,10 @@ protected abstract static class SimpleDyadicMathNode extends CoreMethodArrayArgu
         @Child protected CallDispatchHeadNode floatANode;
         @Child protected CallDispatchHeadNode floatBNode;
 
+        protected SimpleDyadicMathNode() {
+            this(null, null);
+        }
+
         protected SimpleDyadicMathNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
             isANode = IsANodeGen.create(context, sourceSection, null, null);