From 61df03c048a89eba18860c5b563ac3d339972eb1 Mon Sep 17 00:00:00 2001
From: Tomas Stupka <tomas.stupka@oracle.com>
Date: Wed, 13 Dec 2017 12:08:11 +0100
Subject: [PATCH] on error reset handlers in FastRTry
---
.../com/oracle/truffle/r/nodes/builtin/fastr/FastRTry.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRTry.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRTry.java
index 53cf1f0e42..1fb8fe48ae 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRTry.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRTry.java
@@ -30,6 +30,8 @@ import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.function.call.RExplicitCallNode;
+import com.oracle.truffle.r.runtime.RErrorHandling;
+import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.builtins.RBuiltin;
import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
@@ -53,6 +55,9 @@ public abstract class FastRTry extends RBuiltinNode.Arg1 {
try {
call.execute(frame, func, RArgsValuesAndNames.EMPTY);
} catch (Throwable ex) {
+ // try to recover from a possibly incosistent state when running tests:
+ // some handlers might still be lying around and interfere with subsequent calls
+ RErrorHandling.resetStacks();
return formatError(ex);
}
return RRuntime.LOGICAL_TRUE;
--
GitLab