From 08947aa2232c10deffcb6e189e8f3caf11da0da6 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Mon, 20 Nov 2017 18:41:17 +0100
Subject: [PATCH] Add transferToInterpreter()
---
com.oracle.truffle.r.native/version.source | 2 +-
.../com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.native/version.source b/com.oracle.truffle.r.native/version.source
index 920a139664..c739b42c4d 100644
--- a/com.oracle.truffle.r.native/version.source
+++ b/com.oracle.truffle.r.native/version.source
@@ -1 +1 @@
-43
+44
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
index 745f44f77e..98a1c486ef 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
@@ -43,6 +43,7 @@ import java.net.MalformedURLException;
import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.dsl.Cached;
@@ -909,6 +910,7 @@ public class FastRInterop {
} catch (UnsupportedMessageException e) {
throw error(RError.Message.MUST_BE_STRING_OR_FUNCTION, "what");
} catch (RuntimeException e) {
+ CompilerDirectives.transferToInterpreter();
throw error(RError.Message.GENERIC, e.getMessage());
}
}
--
GitLab