Skip to content

Commit 13ba0da

Browse files
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/2364
2 parents 3b2cf67 + f162d84 commit 13ba0da

File tree

9 files changed

+447
-13
lines changed

9 files changed

+447
-13
lines changed

common.json

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u272+10-jvmci-21.0-b03", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u271+09-jvmci-21.0-b03", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u271+09-jvmci-21.0-b03-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u282+07-jvmci-21.0-b06", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.0-b06", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.0-b06-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.3+7", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.9+10-jvmci-21.0-b03", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.9+7-jvmci-21.0-b03", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.10+8-jvmci-21.0-b06", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.10+8-jvmci-21.0-b06", "platformspecific": true },
1313

1414
"oraclejdk15": {"name": "oraclejdk", "version": "15.0.1+6", "platformspecific": true },
15-
"labsjdk-ce-15": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b03", "platformspecific": true },
16-
"labsjdk-ce-15Debug": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b03-debug", "platformspecific": true },
17-
"labsjdk-ee-15": {"name": "labsjdk", "version": "ee-15.0.1+9-jvmci-21.0-b03", "platformspecific": true },
18-
"labsjdk-ee-15Debug": {"name": "labsjdk", "version": "ee-15.0.1+9-jvmci-21.0-b03-debug", "platformspecific": true }
15+
"labsjdk-ce-15": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b06", "platformspecific": true },
16+
"labsjdk-ce-15Debug": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b06-debug", "platformspecific": true },
17+
"labsjdk-ee-15": {"name": "labsjdk", "version": "ee-15.0.2+7-jvmci-21.0-b06", "platformspecific": true },
18+
"labsjdk-ee-15Debug": {"name": "labsjdk", "version": "ee-15.0.2+7-jvmci-21.0-b06-debug", "platformspecific": true }
19+
},
20+
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)",
22+
"devkits": {
23+
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
24+
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.5.5+1" : "==0" }},
25+
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
26+
"windows-jdk15": { "packages" : { "devkit:VS2019-16.5.3+1" : "==0" }}
1927
},
2028

2129
"sulong": {

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "21a3c29d9b142a6005b4fe9bd5c0935cbdb28105",
10+
"version": "fd344ebb6fd78982f8a316e8567d34af1a0943c2",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind" : "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "21a3c29d9b142a6005b4fe9bd5c0935cbdb28105",
19+
"version": "fd344ebb6fd78982f8a316e8567d34af1a0943c2",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.io.IOException;
1515
import java.util.EnumSet;
1616

17+
import com.oracle.truffle.api.interop.InvalidBufferOffsetException;
1718
import org.jcodings.Encoding;
1819
import org.jcodings.specific.UTF8Encoding;
1920
import org.truffleruby.RubyContext;
@@ -438,6 +439,12 @@ public RubyException indexErrorInvalidArrayIndexException(InvalidArrayIndexExcep
438439
return indexError("invalid array index " + exception.getInvalidIndex(), currentNode);
439440
}
440441

442+
@TruffleBoundary
443+
public RubyException indexErrorInvalidBufferOffsetException(InvalidBufferOffsetException exception,
444+
Node currentNode) {
445+
return indexError("invalid buffer offset " + exception.getByteOffset(), currentNode);
446+
}
447+
441448
// LocalJumpError
442449

443450
@TruffleBoundary

src/main/java/org/truffleruby/core/symbol/CoreSymbols.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public class CoreSymbols {
3838
public final RubySymbol ON_BLOCKING = createRubySymbol("on_blocking");
3939
public final RubySymbol DEPRECATED = createRubySymbol("deprecated");
4040
public final RubySymbol EXPERIMENTAL = createRubySymbol("experimental");
41+
public final RubySymbol BIG = createRubySymbol("big");
42+
public final RubySymbol LITTLE = createRubySymbol("little");
43+
public final RubySymbol NATIVE = createRubySymbol("native");
4144

4245
public static final int FIRST_OP_ID = 33;
4346

0 commit comments

Comments
 (0)