Skip to content

Commit 70d9455

Browse files
tzezulaansalond
tzezula
authored and
ansalond
committed
[GR-61520] Backport to 24.2: Upgrade ANTLR to 4.13.2.
PullRequest: fastr/2953
2 parents e71b6ea + 3d6d447 commit 70d9455

File tree

7 files changed

+800
-785
lines changed

7 files changed

+800
-785
lines changed

‎ci/common.jsonnet

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@ local common_json = import "../common.json";
203203
},
204204
},
205205

206+
gradle:: {
207+
downloads+: {
208+
GRADLE_JAVA_HOME: jdks_data["oraclejdk21"],
209+
}
210+
},
211+
206212
local code_tools = {
207213
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
208214
TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
@@ -251,7 +257,7 @@ local common_json = import "../common.json";
251257
} else {},
252258
},
253259

254-
graalpy:: {
260+
graalpy:: self.gradle + {
255261
packages+: if (self.os == "linux") then {
256262
libffi: '>=3.2.1',
257263
bzip2: '>=1.0.6',

‎com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1515
*
1616
* Copyright (c) 2012-2014, Purdue University
17-
* Copyright (c) 2013, 2023, Oracle and/or its affiliates
17+
* Copyright (c) 2013, 2025, Oracle and/or its affiliates
1818
*
1919
* All rights reserved.
2020
*/

‎com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/RLexer.java

Lines changed: 775 additions & 768 deletions
Large diffs are not rendered by default.

‎com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/RParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@
6262

6363
@SuppressWarnings({"all", "this-escape"})
6464
public class RParser extends Parser {
65-
static { RuntimeMetaData.checkVersion("4.12.0", RuntimeMetaData.VERSION); }
65+
static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
6666

6767
protected static final DFA[] _decisionToDFA;
6868
protected static final PredictionContextCache _sharedContextCache =

‎common.json

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

7-
"mx_version": "7.34.1",
7+
"mx_version": "7.35.2",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+22-2651", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+26-3309", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+22", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+22-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+22-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+31", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+31-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+31-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+31-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+31-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+31-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+31-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

‎mx.fastr/mx_fastr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -1161,7 +1161,7 @@ def build_binary_pkgs(args_in, **kwargs):
11611161

11621162
COPYRIGHT_HEADER_GPL3 = """\
11631163
/*
1164-
* Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
1164+
* Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
11651165
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11661166
*
11671167
* This code is free software; you can redistribute it and/or modify it

‎mx.fastr/suite.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"subdir" : True,
1212
# The version must be the same as the version of Sulong
1313
# TRUFFLE REVISION (note: this is a marker for script that can update this)
14-
"version" : "e38604e7078ca4f8c66fdd3f9c3fbf7ec835d894",
14+
"version" : "cf5ab72537397374e97831a440844623dab1d178",
1515
"urls" : [
1616
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
1717
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -22,7 +22,7 @@
2222
"subdir" : True,
2323
# The version must be the same as the version of Truffle
2424
# TRUFFLE REVISION (note: this is a marker for script that can update this)
25-
"version" : "e38604e7078ca4f8c66fdd3f9c3fbf7ec835d894",
25+
"version" : "cf5ab72537397374e97831a440844623dab1d178",
2626
"urls" : [
2727
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
2828
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -392,6 +392,8 @@
392392
"java.logging",
393393
"jdk.unsupported" # sun.misc.Unsafe
394394
],
395+
# Disables all javac warnings, because of our Unsafe usages
396+
"javac.lint.overrides" : "none",
395397
},
396398

397399
"com.oracle.truffle.r.launcher" : {

0 commit comments

Comments
 (0)