Skip to content

Commit b9cf97c

Browse files
OctaveLarosemsimacek
authored andcommitted
[GR-74378] Removing PBytecodeDSLRootNode.getSource to instead use PBytecodeDSLRootNodeGen.getSource
PullRequest: graalpython/4356
2 parents f4f181b + f2b6c86 commit b9cf97c

4 files changed

Lines changed: 9 additions & 18 deletions

File tree

ci/graal/ci/common.jsonnet

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ local common_json = import "../common.json";
377377
"*/*.log",
378378
"*/svmbuild/*.log",
379379
"*/svmbuild/images/*.log",
380-
"*/*/stripped/*.map",
381380
"*/callgrind.*",
382381
"*.log",
383382
],

ci/graal/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.78.0",
7+
"mx_version": "7.78.1",
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.2+10", "platformspecific": true, "extrabundles": ["static-libs"]},
52-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16", "platformspecific": true },
53-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true },
54-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true },
55-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16", "platformspecific": true },
56-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true },
57-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true }
52+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17", "platformspecific": true },
53+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true },
54+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true },
55+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17", "platformspecific": true },
56+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true },
57+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true }
5858
},
5959

6060
"default_jdks" : ["labsjdk-ee-latest", "labsjdk-ce-latest"],

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -950,14 +950,6 @@ public int getFirstLineno() {
950950
return co.startLine;
951951
}
952952

953-
public Source getSource() {
954-
SourceSection section = getSourceSection();
955-
if (section == null) {
956-
return PythonUtils.createFakeSource();
957-
}
958-
return section.getSource();
959-
}
960-
961953
@Override
962954
public abstract boolean isCaptureFramesForTrace(boolean compiledFrame);
963955

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "781c76cda2483f09b630dea7d19074b940eb1970",
56+
"version": "112a2cc351011a3cccf1b8c438843a29a17746fe",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "781c76cda2483f09b630dea7d19074b940eb1970",
64+
"version": "112a2cc351011a3cccf1b8c438843a29a17746fe",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)