From 654d2565edc5bdbc23355dce54a5d0c46d3c930a Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Thu, 10 Aug 2017 14:19:15 +0200
Subject: [PATCH] fix for DSL bug
---
.../nodes/builtin/base/foreign/CallAndExternalFunctions.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
index b126fa2ddf..39015054d0 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
@@ -70,7 +70,6 @@ import com.oracle.truffle.r.library.utils.TypeConvertNodeGen;
import com.oracle.truffle.r.library.utils.UnzipNodeGen;
import com.oracle.truffle.r.nodes.builtin.RExternalBuiltinNode;
import com.oracle.truffle.r.nodes.builtin.RInternalCodeBuiltinNode;
-import com.oracle.truffle.r.nodes.builtin.base.foreign.LookupAdapter.ExtractNativeCallInfoNode;
import com.oracle.truffle.r.nodes.objects.GetPrimNameNodeGen;
import com.oracle.truffle.r.nodes.objects.NewObjectNodeGen;
import com.oracle.truffle.r.runtime.FastROptions;
@@ -788,7 +787,7 @@ public class CallAndExternalFunctions {
}
@SuppressWarnings("unused")
- @Specialization(limit = "1", guards = {"cached == symbol"})
+ @Specialization(limit = "2", guards = {"cached == symbol"})// limit="2" because of DSL bug
protected Object callNamedFunction(RList symbol, RArgsValuesAndNames args, Object packageName,
@Cached("symbol") RList cached,
@Cached("new()") ExtractNativeCallInfoNode extractSymbolInfo,
@@ -885,7 +884,7 @@ public class CallAndExternalFunctions {
}
@SuppressWarnings("unused")
- @Specialization(limit = "1", guards = {"cached == symbol"})
+ @Specialization(limit = "2", guards = {"cached == symbol"}) // limit="2" because of DSL bug
protected Object callNamedFunction(RList symbol, RArgsValuesAndNames args, Object packageName,
@Cached("symbol") RList cached,
@Cached("new()") ExtractNativeCallInfoNode extractSymbolInfo,
--
GitLab