From c8358f2a70dfd8300fcb546e13fcdac1e4c9783d Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Thu, 29 Jan 2015 09:08:59 -0800
Subject: [PATCH] fix TruffleBoundary/VirtualFrame
---
.../oracle/truffle/r/nodes/function/S3DispatchNode.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3DispatchNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3DispatchNode.java
index 11cc9d291f..aeb1362dc4 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3DispatchNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3DispatchNode.java
@@ -170,9 +170,13 @@ public abstract class S3DispatchNode extends DispatchNode {
return wvnCopy;
}
- @TruffleBoundary
private static void addVar(VirtualFrame frame, final String varName) {
- findOrAddFrameSlot(frame.getFrameDescriptor(), varName);
+ addVarHelper(frame.getFrameDescriptor(), varName);
+ }
+
+ @TruffleBoundary
+ private static void addVarHelper(FrameDescriptor frameDescriptor, final String varName) {
+ findOrAddFrameSlot(frameDescriptor, varName);
}
protected void defineVarsInFrame(VirtualFrame frame) {
--
GitLab