Skip to content

[pull] master from ruby:master #952

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
pull merged 1 commit into from
Apr 21, 2026
+2 −1
Merged

[pull] master from ruby:master #952

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
3 changes: 2 additions & 1 deletion vm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ zjit_compile(rb_execution_context_t *ec)

static inline void zjit_materialize_frames(rb_control_frame_t *cfp);

#if USE_YJIT || USE_ZJIT
// Execute JIT code compiled by yjit_compile() or zjit_compile()
static inline VALUE
jit_exec(rb_execution_context_t *ec)
Expand Down Expand Up @@ -595,7 +596,6 @@ jit_exec(rb_execution_context_t *ec)
return Qundef;
}

#if USE_YJIT || USE_ZJIT
// Generate JIT code that supports the following kind of ISEQ entry:
// * The first ISEQ pushed by vm_exec_handle_exception. The frame would
// point to a location specified by a catch table, and it doesn't have
Expand Down Expand Up @@ -652,6 +652,7 @@ jit_exec_exception(rb_execution_context_t *ec)
}
#else
# define jit_compile_exception(ec) ((rb_jit_func_t)0)
# define jit_exec(ec) Qundef
# define jit_exec_exception(ec) Qundef
#endif

Expand Down