From 2ec95e20891f5cbb3533b4c72896958ef31f098a Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Mon, 21 Nov 2016 14:27:48 +0100
Subject: [PATCH] update Truffle, explicitly use DSLGenerator.DEFAULT in RTypes
---
.../src/com/oracle/truffle/r/runtime/data/RTypes.java | 3 +++
mx.fastr/suite.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
index df4552dc03..6b473ad2b6 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypes.java
@@ -26,6 +26,8 @@ import com.oracle.truffle.api.dsl.ImplicitCast;
import com.oracle.truffle.api.dsl.TypeCast;
import com.oracle.truffle.api.dsl.TypeCheck;
import com.oracle.truffle.api.dsl.TypeSystem;
+import com.oracle.truffle.api.dsl.internal.DSLOptions;
+import com.oracle.truffle.api.dsl.internal.DSLOptions.DSLGenerator;
import com.oracle.truffle.api.frame.FrameSlot;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.r.runtime.RType;
@@ -52,6 +54,7 @@ import com.oracle.truffle.r.runtime.nodes.RNode;
MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class,
RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RSymbol.class, RPromise.class, RLanguage.class,
RPairList.class, RExternalPtr.class, RS4Object.class, RAbstractContainer.class, RAttributable.class, RArgsValuesAndNames.class, RTypedValue.class, RType.class, Object[].class})
+@DSLOptions(defaultGenerator = DSLGenerator.DEFAULT)
public class RTypes {
@TypeCheck(RNull.class)
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 971b6743e1..08c061c0ba 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -28,7 +28,7 @@ suite = {
"suites" : [
{
"name" : "truffle",
- "version" : "3c34543a8b7ff5edd74b76aafbeb3af52bd4afe7",
+ "version" : "f0c06d466056ad23e05aa3d21b98405cd72f117b",
"urls" : [
{"url" : "https://github.com/graalvm/truffle", "kind" : "git"},
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
--
GitLab