From 5095715d10977d62de6371c599e439bf21bcee74 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 4 Jan 2017 10:46:01 +0100
Subject: [PATCH] use voidExecute in loops
---
.../src/com/oracle/truffle/r/nodes/control/ForNode.java | 4 ++--
.../src/com/oracle/truffle/r/nodes/control/RepeatNode.java | 2 +-
.../src/com/oracle/truffle/r/nodes/control/WhileNode.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ForNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ForNode.java
index a49df510c7..ef509cf339 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ForNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/ForNode.java
@@ -125,8 +125,8 @@ public final class ForNode extends AbstractLoopNode implements RSyntaxNode, RSyn
}
try {
if (conditionProfile.profile(index <= length)) {
- writeElementNode.execute(frame);
- body.execute(frame);
+ writeElementNode.voidExecute(frame);
+ body.voidExecute(frame);
return true;
} else {
return false;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
index 92ce06b4c2..b46bcb1185 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/RepeatNode.java
@@ -73,7 +73,7 @@ public final class RepeatNode extends AbstractLoopNode implements RSyntaxNode, R
@Override
public boolean executeRepeating(VirtualFrame frame) {
try {
- body.execute(frame);
+ body.voidExecute(frame);
normalBlock.enter();
return true;
} catch (BreakException e) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
index 81d1ab9c10..ccf2b5bbba 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/control/WhileNode.java
@@ -82,7 +82,7 @@ public final class WhileNode extends AbstractLoopNode implements RSyntaxNode, RS
public boolean executeRepeating(VirtualFrame frame) {
try {
if (conditionProfile.profile(condition.executeByte(frame) == RRuntime.LOGICAL_TRUE)) {
- body.execute(frame);
+ body.voidExecute(frame);
normalBlock.enter();
return true;
} else {
--
GitLab