From 41d796206dbcf4fb7ef96cfd9b47d83806283ba1 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 26 May 2015 12:13:21 -0700
Subject: [PATCH] no exit handlers on ConversionFailedException
---
.../truffle/r/nodes/function/FunctionDefinitionNode.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/FunctionDefinitionNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/FunctionDefinitionNode.java
index 5a54394afb..0b23a94106 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/FunctionDefinitionNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/FunctionDefinitionNode.java
@@ -38,6 +38,7 @@ import com.oracle.truffle.r.nodes.*;
import com.oracle.truffle.r.nodes.access.*;
import com.oracle.truffle.r.nodes.access.variables.*;
import com.oracle.truffle.r.nodes.instrument.*;
+import com.oracle.truffle.r.nodes.unary.*;
import com.oracle.truffle.r.runtime.*;
import com.oracle.truffle.r.runtime.RArguments.S3Args;
import com.oracle.truffle.r.runtime.data.*;
@@ -195,7 +196,7 @@ public final class FunctionDefinitionNode extends RRootNode implements RSyntaxNo
} else {
return ex.getResult();
}
- } catch (RInternalError | UnsupportedSpecializationException e) {
+ } catch (RInternalError | UnsupportedSpecializationException | ConversionFailedException e) {
CompilerDirectives.transferToInterpreter();
runOnExitHandlers = false;
throw e;
--
GitLab