From fb049e18cc172709d0df6da5aa02be4dd4af5117 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 13 Apr 2015 20:50:14 -0700
Subject: [PATCH] update Graal to 518ce9a36939
---
.../r/nodes/instrument/REntryCounters.java | 19 ++++++++++++++++---
.../r/nodes/instrument/RNodeTimer.java | 19 ++++++++++++++++---
.../nodes/instrument/debug/DebugHandling.java | 2 +-
.../nodes/instrument/trace/TraceHandling.java | 2 +-
mx.fastr/imports | 2 +-
5 files changed, 35 insertions(+), 9 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 26733ebb1f..f2120f69b3 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
@@ -25,7 +25,6 @@ package com.oracle.truffle.r.nodes.instrument;
import java.util.*;
import com.oracle.truffle.api.instrument.*;
-import com.oracle.truffle.api.instrument.impl.*;
import com.oracle.truffle.r.nodes.function.*;
import com.oracle.truffle.r.runtime.*;
@@ -54,10 +53,24 @@ public class REntryCounters {
enterCount++;
}
- @Override
- public void returnAny(Probe probe) {
+ private void returnAny(@SuppressWarnings("unused") Probe probe) {
exitCount++;
}
+
+ @Override
+ public void returnVoid(Probe probe) {
+ returnAny(probe);
+ }
+
+ @Override
+ public void returnValue(Probe probe, Object result) {
+ returnAny(probe);
+ }
+
+ @Override
+ public void returnExceptional(Probe probe, Exception exception) {
+ returnAny(probe);
+ }
}, "R node entry counter");
counterMap.put(tag, this);
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 77a98979a6..7f6b5d9e88 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
@@ -25,7 +25,6 @@ package com.oracle.truffle.r.nodes.instrument;
import java.util.*;
import com.oracle.truffle.api.instrument.*;
-import com.oracle.truffle.api.instrument.impl.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.r.nodes.*;
import com.oracle.truffle.r.nodes.function.*;
@@ -62,10 +61,24 @@ public class RNodeTimer {
enterTime = System.nanoTime();
}
- @Override
- public void returnAny(Probe probe) {
+ private void returnAny(@SuppressWarnings("unused") Probe probe) {
cumulativeTime += System.nanoTime() - enterTime;
}
+
+ @Override
+ public void returnVoid(Probe probe) {
+ returnAny(probe);
+ }
+
+ @Override
+ public void returnValue(Probe probe, Object result) {
+ returnAny(probe);
+ }
+
+ @Override
+ public void returnExceptional(Probe probe, Exception exception) {
+ returnAny(probe);
+ }
}, "R node timer");
timerMap.put(tag, this);
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 9d92478bcc..dd02f5cef0 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
@@ -178,7 +178,7 @@ public class DebugHandling {
});
}
- private abstract static class DebugEventReceiver implements ASTInstrumentListener {
+ private abstract static class DebugEventReceiver implements StandardInstrumentListener {
protected final Object text;
protected final Object condition;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
index aab97995c1..dc2e80f591 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
@@ -64,7 +64,7 @@ public class TraceHandling {
return probe;
}
- private abstract static class TraceEventReceiver implements ASTInstrumentListener {
+ private abstract static class TraceEventReceiver implements StandardInstrumentListener {
@CompilationFinal private boolean disabled;
CyclicAssumption disabledUnchangedAssumption = new CyclicAssumption("trace event disabled state unchanged");
diff --git a/mx.fastr/imports b/mx.fastr/imports
index eb44e9a76f..267e895975 100644
--- a/mx.fastr/imports
+++ b/mx.fastr/imports
@@ -1 +1 @@
-graal,7bf5292dd7ad2d60d10c069e6615b291964fbe2d,http://hg.openjdk.java.net/graal/graal
+graal,518ce9a36939d45be7d4460c2dae2209404818b3,http://hg.openjdk.java.net/graal/graal
--
GitLab