From 3085ec3dcac532c18c567122786104b50c26697f Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 18 Aug 2017 12:05:21 +0200
Subject: [PATCH] Fixing other tests affected by RNG changes.
---
.../truffle/r/nodes/access/WriteLocalFrameVariableNode.java | 4 ++--
.../com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java | 2 +-
.../src/com/oracle/truffle/r/test/tck/FastRDebugTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteLocalFrameVariableNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteLocalFrameVariableNode.java
index 56acae1d73..527369c269 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteLocalFrameVariableNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteLocalFrameVariableNode.java
@@ -97,12 +97,12 @@ public abstract class WriteLocalFrameVariableNode extends BaseWriteVariableNode
CompilerDirectives.transferToInterpreterAndInvalidate();
containsNoActiveBinding = FrameSlotChangeMonitor.getContainsNoActiveBindingAssumption(frame.getFrameDescriptor());
}
+ Object newValue = shareObjectValue(frame, frameSlot, storedObjectProfile.profile(value), mode, false);
if (containsNoActiveBinding.isValid()) {
- Object newValue = shareObjectValue(frame, frameSlot, storedObjectProfile.profile(value), mode, false);
FrameSlotChangeMonitor.setObjectAndInvalidate(frame, frameSlot, newValue, false, invalidateProfile);
} else {
// it's a local variable lookup; so use 'frame' for both, executing and looking up
- return handleActiveBinding(frame, frame, value, frameSlot, invalidateProfile, isActiveBindingProfile);
+ return handleActiveBinding(frame, frame, newValue, frameSlot, invalidateProfile, isActiveBindingProfile);
}
return value;
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
index a298e3af60..d2da41043e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
@@ -90,7 +90,7 @@ public class TestMiscBuiltins extends TestBase {
assertEval("{ x<-7; as.list(environment()) }");
assertEval("{ x<-7; .y<-42; as.list(environment()) }");
// not sorted so can't compare list print
- assertEval("{ x<-7; .y<-42; length(as.list(environment(), all.names=TRUE)) }");
+ assertEval("{ env <- new.env(); env$x<-7; env$.y<-42; length(as.list(env, all.names=TRUE)) }");
assertEval("{ x<-7; f<-function() x<<-42; f_copy<-as.list(environment())[[\"f\"]]; f_copy(); x }");
// as.matrix
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java
index a419f8ff22..fb0161aacf 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java
@@ -488,7 +488,7 @@ public class FastRDebugTest {
assertEquals(line, currentLine);
final String currentCode = suspendedEvent.getSourceSection().getCode().trim();
assertEquals(code, currentCode);
- compareScope(line, code, false, true, expectedFrame);
+ compareScope(line, code, false, false, expectedFrame);
} catch (RuntimeException | Error e) {
final DebugStackFrame frame = suspendedEvent.getTopStackFrame();
--
GitLab