From 38da07fccd0ef4ace8d7ccb13cc1a3dec4720165 Mon Sep 17 00:00:00 2001 From: Octave Larose Date: Tue, 31 Mar 2026 10:29:37 +0200 Subject: [PATCH 1/4] removing PBytecodeDSLRootNode.getSource to instead use PBytecodeDSLRootNodeGen.getSource --- .../python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java index 8fe8f92779..46868c9eca 100644 --- a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java +++ b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java @@ -950,14 +950,6 @@ public int getFirstLineno() { return co.startLine; } - public Source getSource() { - SourceSection section = getSourceSection(); - if (section == null) { - return PythonUtils.createFakeSource(); - } - return section.getSource(); - } - @Override public abstract boolean isCaptureFramesForTrace(boolean compiledFrame); From f2b6c8675ce0624b93bf49a8982c740da6a1fe3e Mon Sep 17 00:00:00 2001 From: Octave Larose Date: Wed, 1 Apr 2026 12:26:48 +0200 Subject: [PATCH 2/4] Update imports --- ci/graal/ci/common.jsonnet | 1 - ci/graal/common.json | 14 +++++++------- mx.graalpython/suite.py | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ci/graal/ci/common.jsonnet b/ci/graal/ci/common.jsonnet index 64bdc01222..8ffba8ec80 100644 --- a/ci/graal/ci/common.jsonnet +++ b/ci/graal/ci/common.jsonnet @@ -377,7 +377,6 @@ local common_json = import "../common.json"; "*/*.log", "*/svmbuild/*.log", "*/svmbuild/images/*.log", - "*/*/stripped/*.map", "*/callgrind.*", "*.log", ], diff --git a/ci/graal/common.json b/ci/graal/common.json index 8c89ceecf3..23911e9756 100644 --- a/ci/graal/common.json +++ b/ci/graal/common.json @@ -4,7 +4,7 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.78.0", + "mx_version": "7.78.1", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { @@ -49,12 +49,12 @@ "graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true }, "oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.2+10", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true } + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true } }, "default_jdks" : ["labsjdk-ee-latest", "labsjdk-ce-latest"], diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py index fb14e2cda9..00decda847 100644 --- a/mx.graalpython/suite.py +++ b/mx.graalpython/suite.py @@ -53,7 +53,7 @@ }, { "name": "tools", - "version": "781c76cda2483f09b630dea7d19074b940eb1970", + "version": "112a2cc351011a3cccf1b8c438843a29a17746fe", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -61,7 +61,7 @@ }, { "name": "regex", - "version": "781c76cda2483f09b630dea7d19074b940eb1970", + "version": "112a2cc351011a3cccf1b8c438843a29a17746fe", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, From a4f7af075de755453fb1202d075409086da62831 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 23 Mar 2026 19:45:46 +0100 Subject: [PATCH 3/4] Update OS version of Darwin CI jobs. --- ci/python-gate.libsonnet | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ci/python-gate.libsonnet b/ci/python-gate.libsonnet index db5ff5b943..70fe178c10 100644 --- a/ci/python-gate.libsonnet +++ b/ci/python-gate.libsonnet @@ -42,9 +42,7 @@ amd64 +: common.darwin_amd64 + { capabilities +: ["ram32gb"], }, - aarch64 +: common.darwin_aarch64 + { - capabilities +: ["darwin_bigsur"], - }, + aarch64 +: common.darwin_aarch64, }, windows +: { amd64 +: common.windows_amd64 + { @@ -280,8 +278,8 @@ local jdk_version = self.jdk_version, local artifact_name = name + os + arch, local capabilities = if (self.os == "darwin" && self.arch != "aarch64") then - // for darwin, amd64: set minimum requirement to bigsur - [c for c in super.capabilities if !std.startsWith(c, "darwin")] + ["darwin_bigsur"] + // for darwin, amd64: set minimum requirements + [c for c in super.capabilities if !std.startsWith(c, "darwin")] else super.capabilities, capabilities: capabilities, From 7b09ff85472060ccf5b26d7849db4a2bee13d991 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 2 Apr 2026 23:27:44 +0200 Subject: [PATCH 4/4] Update imports --- ci/graal/ci/common.jsonnet | 5 ++--- mx.graalpython/suite.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/graal/ci/common.jsonnet b/ci/graal/ci/common.jsonnet index 8ffba8ec80..c31e836b4e 100644 --- a/ci/graal/ci/common.jsonnet +++ b/ci/graal/ci/common.jsonnet @@ -275,7 +275,6 @@ local common_json = import "../common.json"; graalnodejs:: { local this = self, - capabilities+: if self.os == "darwin" then ["!darwin_bigsur", "!darwin_monterey", "!darwin_ventura"] else [], packages+: if self.os == "linux" then { cmake: "==3.22.2", } else {}, @@ -488,8 +487,8 @@ local common_json = import "../common.json"; }, local linux = { os:: "linux", capabilities+: [self.os] }, - # Run darwin jobs on Big Sur or later by excluding all older versions - local darwin = { os:: "darwin", capabilities+: [self.os, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"] }, + # Run darwin jobs on Sonoma or later by excluding all older versions + local darwin = { os:: "darwin", capabilities+: [self.os, "!darwin_bigsur", "!darwin_ventura", "!darwin_monterey"] }, local windows = { os:: "windows", capabilities+: [self.os] }, local amd64 = { arch:: "amd64", capabilities+: [self.arch] }, diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py index c4a8220117..a67f5946f3 100644 --- a/mx.graalpython/suite.py +++ b/mx.graalpython/suite.py @@ -53,7 +53,7 @@ }, { "name": "tools", - "version": "112a2cc351011a3cccf1b8c438843a29a17746fe", + "version": "0f35b9ebdc118f82ce3b298357b88e6845417b52", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -61,7 +61,7 @@ }, { "name": "regex", - "version": "112a2cc351011a3cccf1b8c438843a29a17746fe", + "version": "0f35b9ebdc118f82ce3b298357b88e6845417b52", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"},