Skip to content

Commit 36b266d

Browse files
OracleLabsAutomationwoess
OracleLabsAutomation
authored and
woess
committed
[GR-23997] Periodic update of the graal import (2025-11-17).
PullRequest: js/3634
2 parents fe0cac0 + 8eec380 commit 36b266d

File tree

15 files changed

+57
-87
lines changed

15 files changed

+57
-87
lines changed

‎common.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.65.3",
7+
"mx_version": "7.67.2",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -49,12 +49,12 @@
4949
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5050

5151
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
52-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
53-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
54-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true },
55-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08", "platformspecific": true },
56-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-debug", "platformspecific": true },
57-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b08-sulong", "platformspecific": true }
52+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b09", "platformspecific": true },
53+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b09-debug", "platformspecific": true },
54+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b09-sulong", "platformspecific": true },
55+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b09", "platformspecific": true },
56+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b09-debug", "platformspecific": true },
57+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b09-sulong", "platformspecific": true }
5858
},
5959

6060
"eclipse": {

‎graal-js/mx.graal-js/suite.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"name" : "regex",
2727
"subdir" : True,
28-
"version" : "b4f3706a0f2dfb0029d3ac18ea8727a2f7ae9ecb",
28+
"version" : "e9feeebc22bc4e738ad0ea8897a96fb52fe54e64",
2929
"urls" : [
3030
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3131
]

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ArrayPrototypeBuiltins.java‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import java.util.Comparator;
4848

4949
import com.oracle.truffle.api.CompilerDirectives;
50-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
5150
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
5251
import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
5352
import com.oracle.truffle.api.TruffleSafepoint;
@@ -1313,29 +1312,12 @@ private boolean shouldTryOwnJoin(Object arrayObj) {
13131312
// objects like ProxyArray/ProxyObjects may have one.
13141313
InteropLibrary interop = getInterop();
13151314
try {
1316-
return !interop.hasLanguage(arrayObj) || (interop.getLanguage(arrayObj) == getHostLanguageClass());
1315+
return !interop.hasLanguageId(arrayObj) || (interop.getLanguageId(arrayObj).equals("host"));
13171316
} catch (UnsupportedMessageException umex) {
13181317
throw CompilerDirectives.shouldNotReachHere();
13191318
}
13201319
}
13211320

1322-
@CompilationFinal private Class<?> hostLanguageClass;
1323-
1324-
private Class<?> getHostLanguageClass() {
1325-
if (hostLanguageClass == null) {
1326-
CompilerDirectives.transferToInterpreterAndInvalidate();
1327-
try {
1328-
hostLanguageClass = InteropLibrary.getUncached().getLanguage(getRealm().getEnv().asGuestValue(new Object()));
1329-
} catch (UnsupportedMessageException umex) {
1330-
throw CompilerDirectives.shouldNotReachHere();
1331-
} catch (UnsupportedOperationException uoex) {
1332-
// Fallback: asGuestValue() is not supported in a spawned isolate.
1333-
hostLanguageClass = Object.class;
1334-
}
1335-
}
1336-
return hostLanguageClass;
1337-
}
1338-
13391321
@Specialization
13401322
protected Object toString(Object thisObj,
13411323
@Cached InlinedConditionProfile isJSObjectProfile) {

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/lang/SandboxValidationError.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -42,7 +42,6 @@
4242

4343
import com.oracle.truffle.api.CompilerAsserts;
4444
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
45-
import com.oracle.truffle.api.TruffleLanguage;
4645
import com.oracle.truffle.api.exception.AbstractTruffleException;
4746
import com.oracle.truffle.api.interop.ExceptionType;
4847
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -66,14 +65,14 @@ ExceptionType getExceptionType() {
6665

6766
@SuppressWarnings("static-method")
6867
@ExportMessage
69-
public boolean hasLanguage() {
68+
boolean hasLanguageId() {
7069
return true;
7170
}
7271

7372
@SuppressWarnings("static-method")
7473
@ExportMessage
75-
public Class<? extends TruffleLanguage<?>> getLanguage() {
76-
return JavaScriptLanguage.class;
74+
String getLanguageId() {
75+
return JavaScriptLanguage.ID;
7776
}
7877

7978
@TruffleBoundary

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/BigInt.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
4747
import com.oracle.truffle.api.CompilerDirectives.ValueType;
48-
import com.oracle.truffle.api.TruffleLanguage;
4948
import com.oracle.truffle.api.interop.InteropLibrary;
5049
import com.oracle.truffle.api.interop.TruffleObject;
5150
import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -498,14 +497,14 @@ float asFloat() throws UnsupportedMessageException {
498497

499498
@SuppressWarnings("static-method")
500499
@ExportMessage
501-
boolean hasLanguage() {
500+
boolean hasLanguageId() {
502501
return true;
503502
}
504503

505504
@SuppressWarnings("static-method")
506505
@ExportMessage
507-
Class<? extends TruffleLanguage<?>> getLanguage() {
508-
return JavaScriptLanguage.class;
506+
String getLanguageId() {
507+
return JavaScriptLanguage.ID;
509508
}
510509

511510
@TruffleBoundary

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/GraalJSException.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import com.oracle.truffle.api.CompilerAsserts;
4848
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
4949
import com.oracle.truffle.api.RootCallTarget;
50-
import com.oracle.truffle.api.TruffleLanguage;
5150
import com.oracle.truffle.api.TruffleStackTrace;
5251
import com.oracle.truffle.api.TruffleStackTraceElement;
5352
import com.oracle.truffle.api.dsl.Bind;
@@ -530,14 +529,14 @@ public static void printJSStackTrace(Node originatingNode) {
530529

531530
@SuppressWarnings("static-method")
532531
@ExportMessage
533-
public final boolean hasLanguage() {
532+
boolean hasLanguageId() {
534533
return true;
535534
}
536535

537536
@SuppressWarnings("static-method")
538537
@ExportMessage
539-
public final Class<? extends TruffleLanguage<?>> getLanguage() {
540-
return JavaScriptLanguage.class;
538+
String getLanguageId() {
539+
return JavaScriptLanguage.ID;
541540
}
542541

543542
@ExportMessage

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/SafeInteger.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,6 @@
4343
import com.oracle.truffle.api.CompilerDirectives;
4444
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
4545
import com.oracle.truffle.api.CompilerDirectives.ValueType;
46-
import com.oracle.truffle.api.TruffleLanguage;
4746
import com.oracle.truffle.api.interop.InteropLibrary;
4847
import com.oracle.truffle.api.interop.TruffleObject;
4948
import com.oracle.truffle.api.library.ExportLibrary;
@@ -151,14 +150,14 @@ public SafeInteger addExact(SafeInteger other) {
151150

152151
@SuppressWarnings("static-method")
153152
@ExportMessage
154-
boolean hasLanguage() {
153+
boolean hasLanguageId() {
155154
return true;
156155
}
157156

158157
@SuppressWarnings("static-method")
159158
@ExportMessage
160-
Class<? extends TruffleLanguage<?>> getLanguage() {
161-
return JavaScriptLanguage.class;
159+
String getLanguageId() {
160+
return JavaScriptLanguage.ID;
162161
}
163162

164163
@ExportMessage

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/Symbol.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -44,7 +44,6 @@
4444
import java.util.Objects;
4545

4646
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
47-
import com.oracle.truffle.api.TruffleLanguage;
4847
import com.oracle.truffle.api.dsl.Fallback;
4948
import com.oracle.truffle.api.dsl.Specialization;
5049
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -221,14 +220,14 @@ public int hashCode() {
221220

222221
@SuppressWarnings("static-method")
223222
@ExportMessage
224-
boolean hasLanguage() {
223+
boolean hasLanguageId() {
225224
return true;
226225
}
227226

228227
@SuppressWarnings("static-method")
229228
@ExportMessage
230-
Class<? extends TruffleLanguage<?>> getLanguage() {
231-
return JavaScriptLanguage.class;
229+
String getLanguageId() {
230+
return JavaScriptLanguage.ID;
232231
}
233232

234233
@ExportMessage

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSProxyObject.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -42,7 +42,6 @@
4242

4343
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
4444
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
45-
import com.oracle.truffle.api.TruffleLanguage;
4645
import com.oracle.truffle.api.dsl.Cached;
4746
import com.oracle.truffle.api.dsl.Cached.Shared;
4847
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -276,14 +275,14 @@ public TruffleString toDisplayString(@SuppressWarnings("unused") boolean allowSi
276275

277276
@SuppressWarnings("static-method")
278277
@ExportMessage
279-
public boolean hasLanguage() {
278+
boolean hasLanguageId() {
280279
return true;
281280
}
282281

283282
@SuppressWarnings("static-method")
284283
@ExportMessage
285-
public Class<? extends TruffleLanguage<?>> getLanguage() {
286-
return JavaScriptLanguage.class;
284+
String getLanguageId() {
285+
return JavaScriptLanguage.ID;
287286
}
288287

289288
static Object lookup(boolean callable, boolean constructor) {

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/interop/JSMetaType.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,6 @@
4343
import com.oracle.truffle.api.CompilerAsserts;
4444
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
4545
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
46-
import com.oracle.truffle.api.TruffleLanguage;
4746
import com.oracle.truffle.api.dsl.Cached;
4847
import com.oracle.truffle.api.dsl.Specialization;
4948
import com.oracle.truffle.api.interop.InteropLibrary;
@@ -108,14 +107,14 @@ public boolean isInstance(Object instance, InteropLibrary interop) {
108107

109108
@SuppressWarnings("static-method")
110109
@ExportMessage
111-
boolean hasLanguage() {
110+
boolean hasLanguageId() {
112111
return true;
113112
}
114113

115114
@SuppressWarnings("static-method")
116115
@ExportMessage
117-
Class<? extends TruffleLanguage<?>> getLanguage() {
118-
return JavaScriptLanguage.class;
116+
String getLanguageId() {
117+
return JavaScriptLanguage.ID;
119118
}
120119

121120
@SuppressWarnings("static-method")

0 commit comments

Comments
 (0)