use T_ARRAY type info in the context from splatarray

XrXr · Feb 27, 2024 · ac3849b · ac3849b
1 parent ee21650
commit ac3849b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/yjit.c b/yjit.c
@@ -894,7 +894,7 @@ rb_yjit_ruby2_keywords_splat_p(VALUE obj)
 VALUE
 rb_yjit_splat_varg_checks(VALUE *sp, VALUE splat_array, rb_control_frame_t *cfp)
 {
-    if (!RB_TYPE_P(splat_array, T_ARRAY)) return Qfalse;
+    // We inserted a T_ARRAY guard before this call
     long len = RARRAY_LEN(splat_array);
 
     // Large splat arrays need a separate allocation

diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs
@@ -6217,9 +6217,11 @@ fn gen_send_cfunc(
 
     // Guard for variable length splat call before any modifications to the stack
     if variable_splat {
+        let splat_array = asm.stack_opnd(i32::from(kw_splat) + i32::from(block_arg));
+        guard_object_is_array(asm, splat_array, splat_array.into(), Counter::guard_send_splat_not_array);
+
         asm_comment!(asm, "guard variable length splat call servicable");
         let sp = asm.ctx.sp_opnd(0);
-        let splat_array = asm.stack_opnd(i32::from(kw_splat) + i32::from(block_arg));
         let proceed = asm.ccall(rb_yjit_splat_varg_checks as _, vec![sp, splat_array, CFP]);
         asm.cmp(proceed, Qfalse.into());
         asm.je(Target::side_exit(Counter::guard_send_cfunc_bad_splat_vargs));