[Truffle] Be more clear about errors that go all the way to the top.

jruby · Oct 8, 2014 · c3f9361 · c3f9361
1 parent c4ddf94
commit c3f9361
Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -206,6 +206,7 @@ public static void main(String[] args) {
             // If a Truffle exception gets this far it's a hard failure - don't try and dress it up as a Ruby exception
 
             if (main.config.getCompileMode() == RubyInstanceConfig.CompileMode.TRUFFLE) {
+                System.err.println("Truffle internal error: " + t);
                 t.printStackTrace(System.err);
             } else {
                 // print out as a nice Ruby backtrace

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -804,33 +804,34 @@ public IRubyObject runScriptBody(Script script) {
     }
 
     public IRubyObject runInterpreter(ThreadContext context, ParseResult parseResult, IRubyObject self) {
-       try {
-           if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
-               assert parseResult instanceof RootNode;
-               getTruffleBridge().execute(TranslatorDriver.ParserContext.TOP_LEVEL, getTruffleBridge().toTruffle(self), null, (RootNode) parseResult);
-               return getNil();
+       if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
+           assert parseResult instanceof RootNode;
+           getTruffleBridge().execute(TranslatorDriver.ParserContext.TOP_LEVEL, getTruffleBridge().toTruffle(self), null, (RootNode) parseResult);
+           return getNil();
+       } else {
+           try {
+               return Interpreter.getInstance().execute(this, parseResult, self);
+           } catch (JumpException.ReturnJump rj) {
+               return (IRubyObject) rj.getValue();
            }
-
-           return Interpreter.getInstance().execute(this, parseResult, self);
-       } catch (JumpException.ReturnJump rj) {
-           return (IRubyObject) rj.getValue();
        }
    }
 
     public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObject self) {
         assert rootNode != null : "scriptNode is not null";
 
-        try {
-            if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
-                assert rootNode instanceof RootNode;
-                getTruffleBridge().execute(TranslatorDriver.ParserContext.TOP_LEVEL, getTruffleBridge().toTruffle(self), null, (RootNode) rootNode);
-                return getNil();
-            }
+        if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
+            assert rootNode instanceof RootNode;
+            getTruffleBridge().execute(TranslatorDriver.ParserContext.TOP_LEVEL, getTruffleBridge().toTruffle(self), null, (RootNode) rootNode);
+            return getNil();
+        } else {
+            try {
 
-            // FIXME: retrieve from IRManager unless lifus does it later
-            return Interpreter.getInstance().execute(this, rootNode, self);
-        } catch (JumpException.ReturnJump rj) {
-            return (IRubyObject) rj.getValue();
+                // FIXME: retrieve from IRManager unless lifus does it later
+                return Interpreter.getInstance().execute(this, rootNode, self);
+            } catch (JumpException.ReturnJump rj) {
+                return (IRubyObject) rj.getValue();
+            }
         }
     }