ZJIT: Include in build with YJIT by default when build environment allows #15368
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
XrXr
force-pushed
the
zjit-auto-combo-when-cargo
branch
2 times, most recently
from
c7c7d03 to
d67aed7
Compare
XrXr
changed the title
XrXr
changed the title
XrXr
force-pushed
the
zjit-auto-combo-when-cargo
branch
from
c73e793 to
d787c32
Compare
XrXr
force-pushed
the
zjit-auto-combo-when-cargo
branch
3 times, most recently
from
6f21b9f to
9d8656d
Compare
> insns.def:857:5: error: assigning to 'rb_zjit_func_t' (aka 'unsigned > long (*)(struct rb_execution_context_struct *, struct > rb_control_frame_struct *, unsigned long (*)(struct > rb_execution_context_struct *, struct rb_control_frame_struct *))') from > 'void *' converts between void pointer and function pointer > [-Werror,-Wpedantic]
Mostly YJIT. ZJIT already has the right bindings and this just tweaks the CI configuration.
Its definition changes depending on e.g. whether there is YJIT in the build.
~/zjit/zjit.mk:30: warning: overriding commands for target `~/build-default/'
~/yjit/yjit.mk:26: warning: ignoring old commands for target `~/build-default/'
~/zjit/zjit.mk:30: warning: overriding commands for target `~/build-default/'
~/yjit/yjit.mk:26: warning: ignoring old commands for target `~/build-default/'
This runs the detection, but does nothing with the result. * Fixed version requirement in messages -- ZJIT requires >= 1.85 unlike YJIT. * New: Detect when rust 1.85 is available, and neither --enable-yjit nor --enable-zjit is passed to ./configure, include both YJIT and ZJIT in the build
Building ZJIT requires GNU make at the moment. To get access to `$gnumake`, lift the `make` flavour detection up to the environment section, before the JIT section runs.
"Default" means when `--enable-zjit` is absent from `./configure` arguments.
XrXr
force-pushed
the
zjit-auto-combo-when-cargo
branch
from
92a82a5 to
ed648cd
Compare
tekknolagi
approved these changes
Dec 5, 2025
k0kubun
approved these changes
Dec 5, 2025
st0012
approved these changes
Dec 5, 2025
Contributor
|
Wooooooooooo! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Big series building up to "ZJIT: Build by default when build environment allows
". Please don't squash.
I tested the following configurations:
Other configs
default = neither --enable-yjit nor --enable-zjit
default, rustc 1.85, but no cargo => ZJIT-detection=y YJIT=y ZJIT=n