Skip to content

[pull] master from ruby:master #1350

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
Aug 26, 2026
+6 −30
Merged

[pull] master from ruby:master #1350

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
3 changes: 0 additions & 3 deletions zjit/src/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,9 +1053,6 @@ fn gen_ccall_with_frame(
gen_stack_overflow_check(jit, asm, function, state, state.stack_size());

let args_with_recv_len = args.len() + 1;
if args_with_recv_len > C_ARG_OPNDS.len() {
unimplemented!("Passing C call arguments on the stack");
}
let caller_stack_size = state.stack().len() - args_with_recv_len;

// Can't use gen_prepare_non_leaf_call() because we need to adjust the SP
Expand Down
22 changes: 1 addition & 21 deletions zjit/src/hir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#![allow(clippy::if_same_then_else)]
#![allow(clippy::match_like_matches_macro)]
use crate::{
backend::lir::C_ARG_OPNDS, cast::IntoUsize, codegen::max_iseq_versions, cruby::*, invariants::{self, iseq_seen_ep_escape}, json::Json, options::{DumpHIR, InlineDepth, debug, get_option}, payload::get_or_create_iseq_payload, profile::reset_profiles_remaining, state::{self, ZJITState},
cast::IntoUsize, codegen::max_iseq_versions, cruby::*, invariants::{self, iseq_seen_ep_escape}, json::Json, options::{DumpHIR, InlineDepth, debug, get_option}, payload::get_or_create_iseq_payload, profile::reset_profiles_remaining, state::{self, ZJITState},
};
use std::{
cell::RefCell, collections::{HashMap, HashSet, VecDeque}, ffi::{c_void, c_uint, c_int, CStr}, fmt::Display, ptr, slice::Iter,
Expand Down Expand Up @@ -797,10 +797,7 @@ pub enum SendFallbackReason {
SendNotOptimizedNeedPermission,
/// The block argument is not nil, so we can't optimize to SendWithoutBlockDirect
SendBlockArgNotNil,
CCallWithFrameTooManyArgs,
ObjToStringNotString,
/// Too many arguments in a C call to fit in C ABI registers.
TooManyArgsForLir,
/// An operand doesn't fit in the integer type that encodes it,
/// e.g. an argument count that overflows IseqCall's u16.
OperandTooLarge,
Expand Down Expand Up @@ -871,9 +868,7 @@ impl Display for SendFallbackReason {
SendCfuncArrayVariadic => write!(f, "Send: C function expects array variadic"),
SendNotOptimizedMethodType(method_type) => write!(f, "Send: unsupported method type {:?}", method_type),
SendBlockArgNotNil => write!(f, "Send: block argument is not nil"),
CCallWithFrameTooManyArgs => write!(f, "CCallWithFrame: too many arguments"),
ObjToStringNotString => write!(f, "ObjToString: result is not a string"),
TooManyArgsForLir => write!(f, "Too many arguments for LIR"),
OperandTooLarge => write!(f, "Operand doesn't fit in its encoding"),
BmethodNonIseqProc => write!(f, "Bmethod: Proc object is not defined by an ISEQ"),
ArgcParamMismatch => write!(f, "Argument count does not match parameter count"),
Expand Down Expand Up @@ -4882,13 +4877,6 @@ impl Function {
return Err(());
}

// TODO: Support passing arguments on the stack in C calls
// +1 for self
if (argc as usize)+1 > C_ARG_OPNDS.len() {
fun.set_dynamic_send_reason(send_insn_id, TooManyArgsForLir);
return Err(());
}

// Check singleton class assumption first, before emitting other patchpoints
if !fun.assume_no_singleton_classes(block, recv_class, state) {
fun.set_dynamic_send_reason(send_insn_id, SingletonClassSeen);
Expand Down Expand Up @@ -5243,14 +5231,6 @@ impl Function {
self.set_dynamic_send_reason(insn_id, ArgcParamMismatch);
continue;
}
// TODO: Support passing arguments on the stack in C calls
// +1 for self
if args.len()+1 > C_ARG_OPNDS.len() {
self.push_insn_id(block, insn_id);
self.set_dynamic_send_reason(insn_id, TooManyArgsForLir);
continue;
}

emit_super_call_guards(self, block, super_cme, current_cme, mid, state, frame_state_iseq);

// Try inlining the cfunc into HIR
Expand Down
7 changes: 5 additions & 2 deletions zjit/src/hir/opt_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21831,15 +21831,18 @@ mod hir_opt_tests {
v31:Fixnum[6] = Const Value(6)
v33:Fixnum[7] = Const Value(7)
v35:Fixnum[8] = Const Value(8)
v37:BasicObject = Send v14, :eight, v21, v23, v25, v27, v29, v31, v33, v35 # SendFallbackReason: Too many arguments for LIR
PatchPoint NoSingletonClass(ZJITEightArgs@0x1008)
PatchPoint MethodRedefined(ZJITEightArgs@0x1008, eight@0x1010, cme:0x1018)
v70:ObjectSubclass[class_exact:ZJITEightArgs] = GuardType v14, ObjectSubclass[class_exact:ZJITEightArgs] recompile
v71:BasicObject = CCallWithFrame v70, :ZJITEightArgs#eight@0x1040, v21, v23, v25, v27, v29, v31, v33, v35
PatchPoint NoEPEscape(test)
v44:CBool = Test v15
v45:Falsy = RefineType v15, Falsy
CondBranch v44, bb5(), bb4()
bb5():
v47:Truthy = RefineType v15, Truthy
CheckInterrupts
Return v37
Return v71
bb4():
v61:NilClass = Const Value(nil)
CheckInterrupts
Expand Down
4 changes: 0 additions & 4 deletions zjit/src/stats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ make_counters! {
// send_fallback_: Fallback reasons for send-ish instructions
send_fallback_send_cfunc_not_variadic,
send_fallback_send_not_optimized_method_type_optimized,
send_fallback_too_many_args_for_lir,
send_fallback_operand_too_large,
send_fallback_send_bop_redefined,
send_fallback_send_operands_not_fixnum,
Expand All @@ -272,7 +271,6 @@ make_counters! {
send_fallback_send_not_optimized_method_type,
send_fallback_send_not_optimized_need_permission,
send_fallback_send_block_arg_not_nil,
send_fallback_ccall_with_frame_too_many_args,
send_fallback_argc_param_mismatch,
// The call has at least one feature on the caller or callee side
// that the optimizer does not support.
Expand Down Expand Up @@ -682,7 +680,6 @@ pub fn send_fallback_counter(reason: crate::hir::SendFallbackReason) -> Counter
SendCfuncNotVariadic => send_fallback_send_cfunc_not_variadic,
SendNotOptimizedMethodTypeOptimized(_)
=> send_fallback_send_not_optimized_method_type_optimized,
TooManyArgsForLir => send_fallback_too_many_args_for_lir,
OperandTooLarge => send_fallback_operand_too_large,
SendBopRedefined => send_fallback_send_bop_redefined,
SendOperandsNotFixnum => send_fallback_send_operands_not_fixnum,
Expand All @@ -704,7 +701,6 @@ pub fn send_fallback_counter(reason: crate::hir::SendFallbackReason) -> Counter
SendNotOptimizedMethodType(_) => send_fallback_send_not_optimized_method_type,
SendNotOptimizedNeedPermission => send_fallback_send_not_optimized_need_permission,
SendBlockArgNotNil => send_fallback_send_block_arg_not_nil,
CCallWithFrameTooManyArgs => send_fallback_ccall_with_frame_too_many_args,
ObjToStringNotString => send_fallback_obj_to_string_not_string,
SuperCallWithBlock => send_fallback_super_call_with_block,
SuperFromBlock => send_fallback_super_from_block,
Expand Down