Skip to content
Snippets Groups Projects
Commit 2fe93020 authored by Stepan Sindelar's avatar Stepan Sindelar
Browse files

Merge pull request #512 in G/fastr from ~MICK.JORDAN_ORACLE.COM/fastr:feature/svm to master

* commit '601e9407':
  FastRTry: use Utils.stringFormat (TruffleBoundary)
parents fe2ff93e 601e9407
Branches
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ import com.oracle.truffle.r.nodes.builtin.RBuiltinNode; ...@@ -33,6 +33,7 @@ import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.function.RCallBaseNode; import com.oracle.truffle.r.nodes.function.RCallBaseNode;
import com.oracle.truffle.r.nodes.function.RCallNode; import com.oracle.truffle.r.nodes.function.RCallNode;
import com.oracle.truffle.r.runtime.RRuntime; import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.Utils;
import com.oracle.truffle.r.runtime.builtins.RBuiltin; import com.oracle.truffle.r.runtime.builtins.RBuiltin;
import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames; import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
import com.oracle.truffle.r.runtime.data.RFunction; import com.oracle.truffle.r.runtime.data.RFunction;
...@@ -55,7 +56,7 @@ public abstract class FastRTry extends RBuiltinNode { ...@@ -55,7 +56,7 @@ public abstract class FastRTry extends RBuiltinNode {
frame.setObject(frameSlot, RArgsValuesAndNames.EMPTY); frame.setObject(frameSlot, RArgsValuesAndNames.EMPTY);
call.execute(frame, func); call.execute(frame, func);
} catch (Throwable ex) { } catch (Throwable ex) {
return String.format("Exception %s, message: %s", ex.getClass().getSimpleName(), ex.getMessage()); return Utils.stringFormat("Exception %s, message: %s", ex.getClass().getSimpleName(), ex.getMessage());
} finally { } finally {
frame.setObject(frameSlot, null); frame.setObject(frameSlot, null);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment