jruby · Feb 29, 2016 · Feb 29, 2016 · Feb 29, 2016 · Feb 29, 2016 · Feb 29, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -925,9 +925,9 @@ public DynamicObject runtimeError(String message, Node currentNode) {
         return ExceptionNodes.createRubyException(runtimeErrorClass, StringOperations.createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode));
     }
 
-    public DynamicObject systemStackError(String message, Node currentNode) {
-        CompilerAsserts.neverPartOfCompilation();
-        return ExceptionNodes.createRubyException(systemStackErrorClass, StringOperations.createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode));
+    @TruffleBoundary
+    public DynamicObject systemStackErrorStackLevelTooDeep(Node currentNode, Throwable javaThrowable) {
+        return ExceptionNodes.createRubyException(systemStackErrorClass, StringOperations.createString(context, StringOperations.encodeRope("stack level too deep", UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode, javaThrowable));
     }
 
     @TruffleBoundary
@@ -1033,8 +1033,8 @@ public DynamicObject breakFromProcClosure(Node currentNode) {
         return localJumpError("break from proc-closure", currentNode);
     }
 
+    @TruffleBoundary
     public DynamicObject unexpectedReturn(Node currentNode) {
-        CompilerAsserts.neverPartOfCompilation();
         return localJumpError("unexpected return", currentNode);
     }
 
@@ -1289,8 +1289,13 @@ public DynamicObject notImplementedError(String message, Node currentNode) {
         return ExceptionNodes.createRubyException(notImplementedErrorClass, StringOperations.createString(context, StringOperations.encodeRope(String.format("Method %s not implemented", message), UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode));
     }
 
+    @TruffleBoundary
+    public DynamicObject syntaxErrorInvalidRetry(Node currentNode) {
+        return syntaxError("Invalid retry", currentNode);
+    }
+
+    @TruffleBoundary
     public DynamicObject syntaxError(String message, Node currentNode) {
-        CompilerAsserts.neverPartOfCompilation();
         return ExceptionNodes.createRubyException(syntaxErrorClass, StringOperations.createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode));
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
@@ -231,7 +231,7 @@ private static RubyRootNode makeGenericMethod(RubyContext context, MethodDetails
             AmbiguousOptionalArgumentChecker.verifyNoAmbiguousOptionalArguments(methodDetails);
         }
 
-        final RubyNode checkArity = new CheckArityNode(context, sourceSection, arity);
+        final RubyNode checkArity = Translator.createCheckArityNode(context, sourceSection, arity);
         RubyNode sequence = Translator.sequence(context, sourceSection, Arrays.asList(checkArity, methodNode));
 
         if (method.returnsEnumeratorIfNoBlock()) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
@@ -421,7 +421,7 @@ public DynamicObject generateAccessor(VirtualFrame frame, DynamicObject module,
             final String accessorName = isGetter ? name : name + "=";
             final String indicativeName = name + "(attr_" + (isGetter ? "reader" : "writer") + ")";
 
-            final RubyNode checkArity = new CheckArityNode(getContext(), sourceSection, arity);
+            final RubyNode checkArity = Translator.createCheckArityNode(getContext(), sourceSection, arity);
             final SharedMethodInfo sharedMethodInfo = new SharedMethodInfo(sourceSection, LexicalScope.NONE, arity, indicativeName, false, null, false, false, false);
 
             final SelfNode self = new SelfNode(getContext(), sourceSection);

diff --git a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java
@@ -149,7 +149,7 @@ protected DynamicObject createProc(VirtualFrame frame, DynamicObject symbol) {
                     sourceSection, null, Arity.AT_LEAST_ONE, Layouts.SYMBOL.getString(symbol),
                     true, ArgumentDescriptor.ANON_REST, false, false, false);
 
-            final RubyRootNode rootNode = new RubyRootNode(getContext(), sourceSection, new FrameDescriptor(nil()), sharedMethodInfo, Translator.sequence(getContext(), sourceSection, Arrays.asList(new CheckArityNode(getContext(), sourceSection, Arity.AT_LEAST_ONE), new SymbolProcNode(getContext(), sourceSection, Layouts.SYMBOL.getString(symbol)))), false);
+            final RubyRootNode rootNode = new RubyRootNode(getContext(), sourceSection, new FrameDescriptor(nil()), sharedMethodInfo, Translator.sequence(getContext(), sourceSection, Arrays.asList(Translator.createCheckArityNode(getContext(), sourceSection, Arity.AT_LEAST_ONE), new SymbolProcNode(getContext(), sourceSection, Layouts.SYMBOL.getString(symbol)))), false);
 
             final CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
             final InternalMethod method = RubyArguments.getMethod(frame);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/Arity.java b/truffle/src/main/java/org/jruby/truffle/language/methods/Arity.java
@@ -48,10 +48,6 @@ public int getPreRequired() {
         return preRequired;
     }
 
-    public int getPostRequired() {
-        return postRequired;
-    }
-
     public int getRequired() {
         return preRequired + postRequired;
     }
@@ -64,10 +60,6 @@ public boolean hasRest() {
         return hasRest;
     }
 
-    public int getRestPosition() {
-        return preRequired + optional;
-    }
-
     public boolean acceptsKeywords() {
         return hasKeywords() || hasKeywordsRest();
     }
@@ -76,10 +68,6 @@ public boolean hasKeywords() {
         return keywordArguments.length != 0;
     }
 
-    public int getKeywordsCount() {
-        return keywordArguments.length;
-    }
-
     public boolean hasKeywordsRest() {
         return hasKeywordsRest;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchBreakNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchBreakNode.java
@@ -10,40 +10,32 @@
 package org.jruby.truffle.language.methods;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.BreakException;
 import org.jruby.truffle.language.control.BreakID;
 
-/**
- * Catch a {@code break} from a call with a block containing a break
- * or inside a while/until loop.
- */
 public class CatchBreakNode extends RubyNode {
 
-    @Child private RubyNode body;
-
     private final BreakID breakID;
 
-    private final BranchProfile breakProfile = BranchProfile.create();
+    @Child private RubyNode body;
+
     private final ConditionProfile matchingBreakProfile = ConditionProfile.createCountingProfile();
 
-    public CatchBreakNode(RubyContext context, SourceSection sourceSection, RubyNode body, BreakID breakID) {
+    public CatchBreakNode(RubyContext context, SourceSection sourceSection, BreakID breakID, RubyNode body) {
         super(context, sourceSection);
-        this.body = body;
         this.breakID = breakID;
+        this.body = body;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         try {
             return body.execute(frame);
         } catch (BreakException e) {
-            breakProfile.enter();
-
             if (matchingBreakProfile.profile(e.getBreakID() == breakID)) {
                 return e.getResult();
             } else {

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForLambdaNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForLambdaNode.java
@@ -9,7 +9,6 @@
  */
 package org.jruby.truffle.language.methods;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -26,20 +25,20 @@
 
 public class CatchForLambdaNode extends RubyNode {
 
-    @Child private RubyNode body;
     private final ReturnID returnID;
 
-    private final BranchProfile returnProfile = BranchProfile.create();
-    private final ConditionProfile matchingReturnProfile = ConditionProfile.createBinaryProfile();
+    @Child private RubyNode body;
 
+    private final ConditionProfile matchingReturnProfile = ConditionProfile.createBinaryProfile();
+    private final BranchProfile retryProfile = BranchProfile.create();
     private final BranchProfile redoProfile = BranchProfile.create();
     private final BranchProfile nextProfile = BranchProfile.create();
     private final BranchProfile breakProfile = BranchProfile.create();
 
-    public CatchForLambdaNode(RubyContext context, SourceSection sourceSection, RubyNode body, ReturnID returnID) {
+    public CatchForLambdaNode(RubyContext context, SourceSection sourceSection, ReturnID returnID, RubyNode body) {
         super(context, sourceSection);
-        this.body = body;
         this.returnID = returnID;
+        this.body = body;
     }
 
     @Override
@@ -48,15 +47,14 @@ public Object execute(VirtualFrame frame) {
             try {
                 return body.execute(frame);
             } catch (ReturnException e) {
-                returnProfile.enter();
                 if (matchingReturnProfile.profile(e.getReturnID() == returnID)) {
                     return e.getValue();
                 } else {
                     throw e;
                 }
             } catch (RetryException e) {
-                CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(coreLibrary().syntaxError("Invalid retry", this));
+                retryProfile.enter();
+                throw new RaiseException(coreLibrary().syntaxErrorInvalidRetry(this));
             } catch (RedoException e) {
                 redoProfile.enter();
                 getContext().getSafepointManager().poll(this);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForMethodNode.java
@@ -9,7 +9,6 @@
  */
 package org.jruby.truffle.language.methods;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -23,32 +22,32 @@
 
 public class CatchForMethodNode extends RubyNode {
 
-    @Child private RubyNode body;
     private final ReturnID returnID;
 
-    private final BranchProfile returnProfile = BranchProfile.create();
+    @Child private RubyNode body;
+
     private final ConditionProfile matchingReturnProfile = ConditionProfile.createBinaryProfile();
+    private final BranchProfile retryProfile = BranchProfile.create();
 
-    public CatchForMethodNode(RubyContext context, SourceSection sourceSection, RubyNode body, ReturnID returnID) {
+    public CatchForMethodNode(RubyContext context, SourceSection sourceSection, ReturnID returnID, RubyNode body) {
         super(context, sourceSection);
-        this.body = body;
         this.returnID = returnID;
+        this.body = body;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
         try {
             return body.execute(frame);
         } catch (ReturnException e) {
-            returnProfile.enter();
             if (matchingReturnProfile.profile(e.getReturnID() == returnID)) {
                 return e.getValue();
             } else {
                 throw e;
             }
         } catch (RetryException e) {
-            CompilerDirectives.transferToInterpreter();
-            throw new RaiseException(coreLibrary().syntaxError("Invalid retry", this));
+            retryProfile.enter();
+            throw new RaiseException(coreLibrary().syntaxErrorInvalidRetry(this));
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForProcNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchForProcNode.java
@@ -9,7 +9,6 @@
  */
 package org.jruby.truffle.language.methods;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
@@ -26,6 +25,7 @@ public class CatchForProcNode extends RubyNode {
 
     private final BranchProfile redoProfile = BranchProfile.create();
     private final BranchProfile nextProfile = BranchProfile.create();
+    private final BranchProfile retryProfile = BranchProfile.create();
 
     public CatchForProcNode(RubyContext context, SourceSection sourceSection, RubyNode body) {
         super(context, sourceSection);
@@ -45,8 +45,8 @@ public Object execute(VirtualFrame frame) {
                 nextProfile.enter();
                 return e.getResult();
             } catch (RetryException e) {
-                CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(coreLibrary().syntaxError("Invalid retry", this));
+                retryProfile.enter();
+                throw new RaiseException(coreLibrary().syntaxErrorInvalidRetry(this));
             }
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchNextNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchNextNode.java
@@ -16,9 +16,6 @@
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.NextException;
 
-/**
- * Catch a {@code next} jump at the root of a method.
- */
 public class CatchNextNode extends RubyNode {
 
     @Child private RubyNode body;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchRetryAsErrorNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchRetryAsErrorNode.java
@@ -9,8 +9,8 @@
  */
 package org.jruby.truffle.language.methods;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
@@ -21,6 +21,8 @@ public class CatchRetryAsErrorNode extends RubyNode {
 
     @Child private RubyNode body;
 
+    private final BranchProfile retryProfile = BranchProfile.create();
+
     public CatchRetryAsErrorNode(RubyContext context, SourceSection sourceSection, RubyNode body) {
         super(context, sourceSection);
         this.body = body;
@@ -31,8 +33,8 @@ public Object execute(VirtualFrame frame) {
         try {
             return body.execute(frame);
         } catch (RetryException e) {
-            CompilerDirectives.transferToInterpreter();
-            throw new RaiseException(coreLibrary().syntaxError("Invalid retry", this));
+            retryProfile.enter();
+            throw new RaiseException(coreLibrary().syntaxErrorInvalidRetry(this));
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CatchReturnAsErrorNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CatchReturnAsErrorNode.java
@@ -9,21 +9,20 @@
  */
 package org.jruby.truffle.language.methods;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.control.ReturnException;
 
-/**
- * Catch a {@code return} jump at the root of a method, and report it as an error.
- */
 public class CatchReturnAsErrorNode extends RubyNode {
 
     @Child private RubyNode body;
 
+    private final BranchProfile retryProfile = BranchProfile.create();
+
     public CatchReturnAsErrorNode(RubyContext context, SourceSection sourceSection, RubyNode body) {
         super(context, sourceSection);
         this.body = body;
@@ -34,7 +33,7 @@ public Object execute(VirtualFrame frame) {
         try {
             return body.execute(frame);
         } catch (ReturnException e) {
-            CompilerDirectives.transferToInterpreter();
+            retryProfile.enter();
             throw new RaiseException(coreLibrary().unexpectedReturn(this));
         }
     }