Skip to content

[GR-76433] Use WITH_SOURCE again #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 3 commits into from
Jun 9, 2026
Merged

[GR-76433] Use WITH_SOURCE again #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8549074
Abbreviate commits in bisect branch names
msimacek Jun 8, 2026
9da83c2
Unpin librt patch
msimacek Jun 8, 2026
cf597bf
Revert to using WITH_SOURCE bytecode config
msimacek Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...acle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@ public BytecodeSupplier(byte[] serialized, TruffleFile bytecodeFile, SourceRefer
public PBytecodeDSLRootNode createRootNode(PythonLanguage language) {
BytecodeRootNodes<PBytecodeDSLRootNode> deserialized;
try {
deserialized = PBytecodeDSLRootNodeGen.deserialize(language, BytecodeConfig.DEFAULT,
deserialized = PBytecodeDSLRootNodeGen.deserialize(language, BytecodeConfig.WITH_SOURCE,
() -> SerializationUtils.createByteBufferDataInput(ByteBuffer.wrap(getBytecode())),
/*
* NB: Since a DSL node may reparse multiple times, we cannot reuse
Expand Down
2 changes: 1 addition & 1 deletion ...acle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ private record CodeUnitKey(SSTNode node, CompilationScope scope) {
private BytecodeDSLCompilerResult compileRootNode(String name, ArgumentInfo argumentInfo, SSTNode node, BytecodeParser<Builder> parser) {
qualName = getNewScopeQualName(name, scopeType);

BytecodeRootNodes<PBytecodeDSLRootNode> nodes = PBytecodeDSLRootNodeGen.create(ctx.language, BytecodeConfig.DEFAULT, parser);
BytecodeRootNodes<PBytecodeDSLRootNode> nodes = PBytecodeDSLRootNodeGen.create(ctx.language, BytecodeConfig.WITH_SOURCE, parser);
List<PBytecodeDSLRootNode> nodeList = nodes.getNodes();
assert nodeList.size() == 1;
PBytecodeDSLRootNode rootNode = nodeList.get(0);
Expand Down
196 changes: 0 additions & 196 deletions graalpython/lib-graalpython/patches/librt-0.9.0.patch
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions graalpython/lib-graalpython/patches/metadata.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,12 +1161,7 @@ patch = 'librt-0.7.8.patch'
license = 'MIT'

[[librt.rules]]
version = '== 0.9.0'
patch = 'librt-0.9.0.patch'
license = 'MIT'

[[librt.rules]]
version = '== 0.10.0'
version = '>= 0.7.8'
patch = 'librt-0.10.0.patch'
license = 'MIT'

Expand Down
8 changes: 6 additions & 2 deletions scripts/bisect_benchmark_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,18 @@ def resolve_commit(repo_dir: str | Path, revision: str) -> str:
return run_command(["git", "rev-parse", revision], cwd=repo_dir).strip()


def abbreviate_commit(commit: str) -> str:
return commit[:12]


def build_branch_name(job_name: str, benchmark_name: str, metric: str, good_commit: str, bad_commit: str) -> str:
slug = "_".join(
[
job_name,
benchmark_name,
metric,
good_commit,
bad_commit,
abbreviate_commit(good_commit),
abbreviate_commit(bad_commit),
]
)
return "bisect/{}".format(slug)
Expand Down
Loading