Skip to content

Commit 6d255f6

Browse files
author
Pavel Marek
committed
[GR-19768] Update Truffle import.
PullRequest: fastr/2672
2 parents 2e487f8 + 617fdf0 commit 6d255f6

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164972,10 +164972,6 @@ Error in as.vector(ta$stringArray2NotSquare) :
164972164972
#if (!any(R.version$engine == "FastR")) { 'class' } else { tc <- java.type('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestNamesClassNoPublicMembers'); t <- .fastr.interop.new(tc); names(t) }
164973164973
[1] "class"
164974164974

164975-
##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testNamesForForeignObject#
164976-
#if (!any(R.version$engine == "FastR")) { NULL } else { names(new(java.type('int[]'), 3)) }
164977-
NULL
164978-
164979164975
##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testNamesForForeignObject#
164980164976
#if (!any(R.version$engine == "FastR")) { NULL } else { tc <- java.type('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestNamesClass'); names(tc$staticField) }
164981164977
NULL
@@ -164984,6 +164980,10 @@ NULL
164984164980
#if (!any(R.version$engine == "FastR")) { NULL } else { tc <- java.type('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestNamesClass'); names(tc$staticMethod) }
164985164981
NULL
164986164982

164983+
##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testNamesForForeignObject#
164984+
#if (!any(R.version$engine == "FastR")) { [1] "length" "clone" } else { names(new(java.type('int[]'), 3)) }
164985+
Error: unexpected '[' in "if (!any(R.version$engine == "FastR")) { ["
164986+
164987164987
##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testNamesForForeignObject#
164988164988
#if (!any(R.version$engine == "FastR")) { c('class', 'field', 'method', 'staticField', 'staticMethod', 'superField', 'superMethod') } else { tc <- java.type('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestNamesClass'); t <- .fastr.interop.new(tc); sort(names(t)) }
164989164989
[1] "class" "field" "method" "staticField" "staticMethod"

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ public void testNamesForForeignObject() {
553553
"c('class', 'field', 'method', 'staticField', 'staticMethod', 'superField', 'superMethod')");
554554

555555
assertEvalFastR("names(java.type('int[]'))", "'class'");
556-
assertEvalFastR("names(new(java.type('int[]'), 3))", "NULL");
556+
assertEvalFastR("names(new(java.type('int[]'), 3))", "[1] \"length\" \"clone\"");
557557
assertEvalFastR("{ java.addToClasspath(paste0(Sys.getenv('R_HOME'),'/mxbuild/dists/fastr-unit-tests.jar')); tec<-new('com.oracle.truffle.r.test.library.fastr.TestExceptionsClass'); tec }",
558558
"cat('[polyglot value]\\n$exception\\n[polyglot value]\\n\\n$class\\n[polyglot value]\\n\\n')");
559559
}

graal_common.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,26 @@
1111
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.3-b03", "platformspecific": true },
1212
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+9-jvmci-21.3-b03", "platformspecific": true },
1313

14-
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
14+
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
1515
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17+35-jvmci-21.3-b03", "platformspecific": true },
1616
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17+35-jvmci-21.3-b03-debug", "platformspecific": true },
1717
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.1+9-jvmci-21.3-b03", "platformspecific": true },
1818
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.1+9-jvmci-21.3-b03-debug", "platformspecific": true }
1919
},
2020

21-
"COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
21+
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
2222
"devkits": {
2323
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2424
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2525
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
2626
"windows-jdk17": { "packages" : { "devkit:VS2019-16.9.3+1" : "==0" }}
2727
},
28+
29+
"catch_files" : [
30+
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
31+
"Dumping debug output to '(?P<filename>[^']+)'"
32+
],
33+
2834
"deps": {
2935
"COMMENT.common": [
3036
"pip:isort is a dependency of pip:pylint. The explicit dependency on the pip package works around",

mx.fastr/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"subdir" : True,
1010
# The version must be the same as the version of Sulong
1111
# TRUFFLE REVISION (note: this is a marker for script that can update this)
12-
"version" : "afbeecc6753e2e0a0d98e0cebc8b7e1511776dec",
12+
"version" : "77da7e95ed6ef536a6e1ea409a37ab49e8344ecc",
1313
"urls" : [
1414
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
1515
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -20,7 +20,7 @@
2020
"subdir" : True,
2121
# The version must be the same as the version of Truffle
2222
# TRUFFLE REVISION (note: this is a marker for script that can update this)
23-
"version" : "afbeecc6753e2e0a0d98e0cebc8b7e1511776dec",
23+
"version" : "77da7e95ed6ef536a6e1ea409a37ab49e8344ecc",
2424
"urls" : [
2525
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
2626
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

0 commit comments

Comments
 (0)