From fa62787700a2565af61edf1b87221801885e5009 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Wed, 19 Aug 2015 13:43:08 +0200
Subject: [PATCH] Disable new vector access nodes until last errors are
resolved.
---
.../truffle/r/nodes/access/vector/ReplaceVectorNode.java | 2 +-
.../src/com/oracle/truffle/r/test/TestBase.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ReplaceVectorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ReplaceVectorNode.java
index 687bafb7fa..de68da1418 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ReplaceVectorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ReplaceVectorNode.java
@@ -40,7 +40,7 @@ public abstract class ReplaceVectorNode extends Node {
/*
* TODO remove this as soon as the new vector access nodes are the default.
*/
- public static final boolean USE_NODE = true;
+ public static final boolean USE_NODE = System.getProperty("newVectorAccess") != null ? System.getProperty("newVectorAccess").equals("true") : false;
protected static final int CACHE_LIMIT = 5;
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
index 8121407bea..ad4af16862 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
@@ -312,7 +312,7 @@ public class TestBase {
protected static final String ERROR = "Error";
protected static final String WARNING = "Warning message";
- private static boolean IGNORE_ERROR_COMPARISON = true;
+ private static final boolean IGNORE_ERROR_COMPARISON = false;
/**
* If this is set to {@code true}, {@link Output#ContainsError} will compare the full output
@@ -489,6 +489,7 @@ public class TestBase {
}
+ @SuppressWarnings("unused")
private CheckResult checkResult(WhiteList[] whiteLists, String input, String originalExpected, String originalResult, boolean containsWarning, boolean mayContainWarning, boolean containsError,
boolean mayContainError) {
boolean ok;
--
GitLab