Skip to content

[GR-79793] Bump the bytecode version on every truffle import. #1172

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 1 commit into from
Sep 25, 2026
Merged

[GR-79793] Bump the bytecode version on every truffle import. #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...e.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/BytecodeDSLCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@
import com.oracle.truffle.api.source.Source;

public class BytecodeDSLCompiler {
public static final int BYTECODE_VERSION = 33;
/*
* Bump this with every Truffle import change because serialized GraalPy bytecode effectively
* depends on Truffle bytecode internals.
*/
public static final int BYTECODE_VERSION = 34;

public static final record BytecodeDSLCompilerResult(PBytecodeDSLRootNode rootNode, BytecodeDSLCodeUnit codeUnit) {
}
Expand Down
22 changes: 18 additions & 4 deletions mx.graalpython/mx_graalpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2739,8 +2739,9 @@ def update_import(name, suite_py: Path, args):
break
if not dep_dir:
mx.warn("could not find suite %s to update" % name)
return
return False
vc = cast(mx.VC, mx.VC.get_vc(dep_dir))
old_tip = str(vc.tip(dep_dir)).strip()
repo_name = os.path.basename(dep_dir)
if repo_name == "graal" and args.graal_rev:
rev = args.graal_rev
Expand All @@ -2762,7 +2763,7 @@ def update_import(name, suite_py: Path, args):
end = dep_match.end(1)
assert end - start == len(tip)
mx.update_file(suite_py.resolve().as_posix(), "".join([contents[:start], tip, contents[end:]]), showDiff=True)
return tip
return tip != old_tip


def _import_update_branch_name():
Expand Down Expand Up @@ -2891,10 +2892,23 @@ def update_import_cmd(args):
for suite in d["suite"].get("imports", {}).get("suites", []):
imports_to_update.add(suite["name"])

revisions = {}
changed = False
# now update all imports
for name in imports_to_update:
revisions[name] = update_import(name, suite_py, args)
changed = update_import(name, suite_py, args) or changed

if changed:
# bump the bytecode version, because truffle may have changed
source = repo / "graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/BytecodeDSLCompiler.java"
with open(source) as f:
contents = f.read()
matches = list(re.compile(r"(public static final int BYTECODE_VERSION = )(\d+)(;)").finditer(contents))
if len(matches) != 1:
mx.abort(f"expected exactly one bytecode version in {source}, found {len(matches)}")
match = matches[0]
version = int(match.group(2))
updated = contents[:match.start(2)] + str(version + 1) + contents[match.end(2):]
mx.update_file(source.resolve().as_posix(), updated, showDiff=True)

shutil.copy(truffle_repo / "common.json", repo / "ci" / "graal" / "common.json")
shutil.copytree(truffle_repo / "ci", repo / "ci" / "graal" / "ci", dirs_exist_ok=True)
Expand Down
Loading