From f0def16836b958917bf1b60da3218b91a30175c4 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 4 Nov 2015 18:33:21 -0800
Subject: [PATCH] handle Truffle API change
---
.../oracle/truffle/r/nodes/instrument/REntryCounters.java | 2 +-
.../com/oracle/truffle/r/nodes/instrument/RNodeTimer.java | 2 +-
.../truffle/r/nodes/instrument/debug/DebugHandling.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java
index adad10544c..a1141a1dce 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java
+++ b/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);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java
index cbe1976345..9e1ca0401f 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java
+++ b/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);
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java
index dd5f93744e..27a2c77fe2 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java
+++ b/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();
}
--
GitLab