# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1435678157 -7200
# Node ID 67ea94a23074000c4bcd0bd860f274b4645dcda5
# Parent  4858c5e074e9005075e89cf5b1c2347ee73a5d31
Truffle/SL Debugging:  fix two places where the QuitException wasn't being handled correctly.

diff -r 4858c5e074e9 -r 67ea94a23074 truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Fri Jun 26 16:25:41 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Tue Jun 30 17:29:17 2015 +0200
@@ -475,6 +475,8 @@
             // TODO (mlvdv) fix to run properly in the current VM
             try {
                 SLLanguage.run(source);
+            } catch (QuitException ex) {
+                throw ex;
             } catch (Exception e) {
                 throw new DebugSupportException(e);
             }
diff -r 4858c5e074e9 -r 67ea94a23074 truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Fri Jun 26 16:25:41 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Tue Jun 30 17:29:17 2015 +0200
@@ -86,6 +86,8 @@
         try {
             result = child.executeGeneric(vFrame);
             probeNode.returnValue(child, vFrame, result);
+        } catch (KillException e) {
+            throw (e);
         } catch (Exception e) {
             probeNode.returnExceptional(child, vFrame, e);
             throw (e);