Merge

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java

@@ -67,7 +67,7 @@ public class REntryCounters {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Exception exception) {
+        public void onReturnExceptional(Probe probe, Throwable exception) {
             returnAny(probe);
         }
 

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java

@@ -75,7 +75,7 @@ public class RNodeTimer {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Exception exception) {
+        public void onReturnExceptional(Probe probe, Throwable exception) {
             returnAny(probe);
         }
 

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java

@@ -206,7 +206,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
         }
 
         boolean disabled() {
@@ -371,7 +371,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
             if (!disabled()) {
                 returnCleanup(frame);
             }
@@ -467,7 +467,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
             if (!disabled()) {
                 returnCleanup();
             }

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java

@@ -136,7 +136,7 @@ public class TraceHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
             if (!disabled()) {
                 indent -= INDENT;
             }
@@ -168,7 +168,7 @@ public class TraceHandling {
 
         }
 
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame vFrame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame vFrame, Throwable exception) {
             if (!disabled()) {
                 //
             }

mx.fastr/suite.py

@@ -21,13 +21,13 @@
 # questions.
 #
 suite = {
-  "mxversion" : "5.6.0",
+  "mxversion" : "5.6.1",
   "name" : "fastr",
   "imports" : {
     "suites" : [
             {
                "name" : "graal",
-               "version" : "b62242b9ddd79896cc69b8f660d0509f61d5519b",
+               "version" : "d6f0245476e26f823d723d21b996eba0a069771b",
                "urls" : [{"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"}]
             },
         ],