Revert "ZJIT: Fix cases where we need to super to C functions with >6 params (ruby#17186)"

This reverts commit e90a7ce.

Author: k0kubun

zjit/src/codegen.rs

@@ -711,11 +711,9 @@ fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, functio
         Insn::PatchPoint { invariant, state } => no_output!(gen_patch_point(jit, asm, invariant, &function.frame_state(*state))),
         Insn::CCall { cfunc, recv, args, name, owner: _, return_type: _, elidable: _ } => gen_ccall(asm, *cfunc, *name, opnd!(recv), opnds!(args)),
         // Give up CCallWithFrame for 7+ args since asm.ccall() supports at most 6 args (recv + args).
-        // We're currently emitting a CCallWithFrame for `super` in to a cfunction.
-        // We can't lower to `gen_send_without_block` because the
-        // source opcode isn't necessarily `opt_send_without_block`
-        // and so the interpreter stack layout may be incompatible.
-        Insn::CCallWithFrame { cd, state, args, block, .. } if args.len() + 1 > C_ARG_OPNDS.len() => return Err(*state),
+        // There's no test case for this because no core cfuncs have this many parameters. But C extensions could have such methods.
+        Insn::CCallWithFrame { cd, state, args, .. } if args.len() + 1 > C_ARG_OPNDS.len() =>
+            gen_send_without_block(jit, asm, *cd, &function.frame_state(*state), SendFallbackReason::CCallWithFrameTooManyArgs),
         Insn::CCallWithFrame { cfunc, recv, name, args, cme, state, block, .. } =>
             gen_ccall_with_frame(jit, asm, *cfunc, *name, opnd!(recv), opnds!(args), *cme, *block, &function.frame_state(*state)),
         Insn::CCallVariadic { cfunc, recv, name, args, cme, state, block, return_type: _, elidable: _ } => {

zjit/src/codegen_tests.rs

@@ -1237,52 +1237,6 @@ fn test_invokesuper_to_cfunc_varargs() {
     "#), @r#"["MyString", true]"#);
 }
 
-#[test]
-fn test_invokesuper_to_cfunc_with_too_many_args_exits() {
-    unsafe extern "C" fn test_six_args(
-        _self: VALUE,
-        a: VALUE,
-        b: VALUE,
-        c: VALUE,
-        d: VALUE,
-        e: VALUE,
-        f: VALUE,
-    ) -> VALUE {
-        unsafe { rb_ary_new_from_args(6, a, b, c, d, e, f) }
-    }
-
-    with_rubyvm(|| {
-        let superclass = define_class("ZJITSixArgs", unsafe { rb_cObject });
-        unsafe {
-            rb_define_method(
-                superclass,
-                c"six".as_ptr(),
-                Some(std::mem::transmute::<
-                    unsafe extern "C" fn(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE) -> VALUE,
-                    unsafe extern "C" fn(VALUE) -> VALUE,
-                >(test_six_args)),
-                6,
-            );
-        }
-    });
-
-    assert_snapshot!(assert_compiles_allowing_exits(r#"
-        class ZJITSixArgsSubclass < ZJITSixArgs
-          def six(a, b, c, d, e, f)
-            super
-          end
-        end
-
-        def test
-          ZJITSixArgsSubclass.new.six(1, 2, 3, 4, 5, 6)
-        end
-
-        test
-        test
-        test
-    "#), @"[1, 2, 3, 4, 5, 6]");
-}
-
 #[test]
 fn test_string_new_preserves_string_arg() {
     assert_snapshot!(inspect(r#"

zjit/src/cruby.rs

@@ -91,7 +91,7 @@
 use std::convert::From;
 use std::ffi::{c_void, CString, CStr};
 use std::fmt::{Debug, Display, Formatter};
-use std::os::raw::{c_char, c_int, c_long, c_uint};
+use std::os::raw::{c_char, c_int, c_uint};
 use std::panic::{catch_unwind, UnwindSafe};
 
 use crate::cast::IntoUsize as _;
@@ -132,7 +132,6 @@ unsafe extern "C" {
     pub fn rb_float_new(d: f64) -> VALUE;
 
     pub fn rb_hash_empty_p(hash: VALUE) -> VALUE;
-    pub fn rb_ary_new_from_args(n: c_long, ...) -> VALUE;
     pub fn rb_str_setbyte(str: VALUE, index: VALUE, value: VALUE) -> VALUE;
     pub fn rb_str_getbyte(str: VALUE, index: VALUE) -> VALUE;
     pub fn rb_vm_splat_array(flag: VALUE, ary: VALUE) -> VALUE;
@@ -166,12 +165,6 @@ unsafe extern "C" {
     pub fn rb_vm_stack_canary() -> VALUE;
     pub fn rb_vm_push_cfunc_frame(cme: *const rb_callable_method_entry_t, recv_idx: c_int);
     pub fn rb_obj_class(klass: VALUE) -> VALUE;
-    pub fn rb_define_method(
-        klass: VALUE,
-        mid: *const c_char,
-        func: Option<unsafe extern "C" fn(args: VALUE) -> VALUE>,
-        arity: c_int,
-    );
     pub fn rb_vm_objtostring(reg_cfp: CfpPtr, recv: VALUE, cd: *const rb_call_data) -> VALUE;
 }