From 03f1da76c0858e5f249dd70e50b768770bcbdb70 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Thu, 29 Mar 2018 17:52:25 +0200
Subject: [PATCH] Revert "try to supply names in LocalReadVariableNode"
This reverts commit d4c432110a690292fd47923572bd46ef7e5b4ca5.
---
.../r/nodes/access/variables/LocalReadVariableNode.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/variables/LocalReadVariableNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/variables/LocalReadVariableNode.java
index 533db22101..f67c254ce6 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/variables/LocalReadVariableNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/variables/LocalReadVariableNode.java
@@ -51,7 +51,6 @@ public final class LocalReadVariableNode extends Node {
private final Object identifier;
private final boolean forceResult;
- @CompilationFinal private boolean firstExecution = true;
@CompilationFinal(dimensions = 1) private boolean[] seenValueKinds;
@CompilationFinal private ValueProfile valueProfile;
@@ -145,13 +144,6 @@ public final class LocalReadVariableNode extends Node {
isPromiseProfile = ConditionProfile.createBinaryProfile();
}
if (isPromiseProfile.profile(result instanceof RPromise)) {
- if (firstExecution) {
- CompilerDirectives.transferToInterpreterAndInvalidate();
- firstExecution = false;
- if (identifier instanceof String) {
- return ReadVariableNode.evalPromiseSlowPathWithName((String) identifier, frame, (RPromise) result);
- }
- }
if (promiseHelper == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
promiseHelper = insert(new PromiseHelperNode());
--
GitLab