diff --git a/com.oracle.truffle.r.native/version.source b/com.oracle.truffle.r.native/version.source index 920a1396648024dd8985b3cafa24d7156e3b2610..c739b42c4d2ce23786c5350641d0adbf5fa7d6b2 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 745f44f77e95f26e4c49dee8da0d6b758fdaaa13..98a1c486ef10f89e416b6a7daa1282334b64dd22 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()); } }