From 94c48da68067cde580b5242576ff6bf5213a84ef Mon Sep 17 00:00:00 2001
From: Michael Haupt <michael.haupt@oracle.com>
Date: Wed, 20 Aug 2014 10:02:57 +0200
Subject: [PATCH] merge with OpenJDK Graal
---
.../src/com/oracle/truffle/r/nodes/RTypes.java | 6 +++---
mx.fastr/imports | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java
index e4d07a54a6..6934ecdb05 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java
@@ -36,9 +36,9 @@ import com.oracle.truffle.r.runtime.data.model.*;
*
* @see RNode
*/
-@TypeSystem({byte.class, int.class, double.class, RRaw.class, RComplex.class, String.class, RIntSequence.class, RDoubleSequence.class, RIntVector.class, RDoubleVector.class, RRawVector.class,
- RComplexVector.class, RStringVector.class, RLogicalVector.class, RFunction.class, RNull.class, RMissing.class, REnvironment.class, RExpression.class, RConnection.class,
- MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class,
+@TypeSystem({boolean.class, byte.class, int.class, double.class, RRaw.class, RComplex.class, String.class, RIntSequence.class, RDoubleSequence.class, RIntVector.class, RDoubleVector.class,
+ RRawVector.class, RComplexVector.class, RStringVector.class, RLogicalVector.class, RFunction.class, RNull.class, RMissing.class, REnvironment.class, RExpression.class,
+ RConnection.class, MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class,
RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RDataFrame.class, RSymbol.class, RPromise.class, RLanguage.class, RPairList.class,
RFormula.class, RAbstractContainer.class, Object[].class})
public class RTypes {
diff --git a/mx.fastr/imports b/mx.fastr/imports
index 355a76588f..030effa10e 100644
--- a/mx.fastr/imports
+++ b/mx.fastr/imports
@@ -1 +1 @@
-graal,518559db79c6d29b2279f61a88964a7ef083dc24,http://hg.openjdk.java.net/graal/graal
+graal,7af9301efe6b78a1882fcf299ee3a89e0dfda18a,http://hg.openjdk.java.net/graal/graal
--
GitLab