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/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); 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"},