[Truffle] Use MainExitException.

jruby · Oct 14, 2015 · 7187bb2 · 7187bb2
1 parent 26c4d68
commit 7187bb2
Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -198,6 +198,10 @@ public static void main(String[] args) {
 
         try {
             Status status = main.run(args);
+
+            printTruffleTimeMetric("after-main");
+            printTruffleMemoryMetric();
+
             if (status.isExit()) {
                 System.exit(status.getStatus());
             }
@@ -221,9 +225,6 @@ public static void main(String[] args) {
 
             System.exit(1);
         }
-
-        printTruffleTimeMetric("after-main");
-        printTruffleMemoryMetric();
     }
 
     public Status run(String[] args) {

diff --git a/core/src/main/java/org/jruby/exceptions/MainExitException.java b/core/src/main/java/org/jruby/exceptions/MainExitException.java
@@ -32,6 +32,10 @@ public class MainExitException extends RuntimeException implements Unrescuable {
     int status;
     private boolean aborted;
 
+    public MainExitException(int status) {
+        this(status, true);
+    }
+
     public MainExitException(int status, String message) {
         super(message);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -722,6 +722,11 @@ public Integer block() throws InterruptedException {
                 }
             });
 
+            /*
+             * We really do want to just exit here as opposed to throwing a MainExitException and tidying up, as we're
+             * pretending that we did exec and so replaced this process with a new one.
+             */
+
             System.exit(exitCode);
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java b/truffle/src/main/java/org/jruby/truffle/nodes/exceptions/TopLevelRaiseHandler.java
@@ -14,6 +14,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
 
+import org.jruby.exceptions.MainExitException;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.cast.IntegerCastNode;
 import org.jruby.truffle.nodes.cast.IntegerCastNodeGen;
@@ -47,12 +48,9 @@ public Object execute(VirtualFrame frame) {
             }
 
             getContext().shutdown();
-            final int status = statusFromException(lastException);
-            System.exit(status);
-        }
 
-        // unreachable
-        return nil();
+            throw new MainExitException(statusFromException(lastException));
+        }
     }
 
     private int statusFromException(DynamicObject exception) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/VMPrimitiveNodes.java
@@ -50,6 +50,7 @@
 import jnr.posix.Times;
 
 import org.jcodings.specific.UTF8Encoding;
+import org.jruby.exceptions.MainExitException;
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.core.BasicObjectNodes;
@@ -155,8 +156,7 @@ public VMExitPrimitiveNode(RubyContext context, SourceSection sourceSection) {
         @Specialization
         public Object vmExit(int status) {
             getContext().shutdown();
-            System.exit(status);
-            return nil();
+            throw new MainExitException(status);
         }
 
         @Fallback

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SimpleShell.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SimpleShell.java
@@ -61,6 +61,7 @@ public void run(MaterializedFrame frame, Node currentNode) {
                     return;
 
                 case "exit":
+                    // We're in the debugger, not normal Ruby, so just hard exit here
                     System.exit(0);
                     break;