Move forwardable conditional

This is not common, so we should do it last

vm_insnhelper.c

@@ -2987,50 +2987,6 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
  const struct rb_callcache *cc = calling->cc;
  bool cacheable_ci = vm_ci_cacheable(ci);
 
- // Called iseq is using ... param
- // def foo(...) # <- iseq for foo will have "forwardable"
- //
- // We want to set the `...` local to the caller's CI
- // foo(1, 2) # <- the ci for this should end up as `...`
- //
- // So hopefully the stack looks like:
- //
- // => 1
- // => 2
- // => *
- // => **
- // => &
- // => ... # <- points at `foo`s CI
- // => cref_or_me
- // => specval
- // => type
- //
- if (ISEQ_BODY(iseq)->param.flags.forwardable) {
- if ((vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
- struct rb_forwarding_call_data * forward_cd = (struct rb_forwarding_call_data *)calling->cd;
- if (vm_ci_argc(ci) != vm_ci_argc(forward_cd->caller_ci)) {
- ci = vm_ci_new_runtime(
- vm_ci_mid(ci),
- vm_ci_flag(ci),
- vm_ci_argc(ci),
- vm_ci_kwarg(ci));
- } else {
- ci = forward_cd->caller_ci;
- }
- }
- // C functions calling iseqs will stack allocate a CI,
- // so we need to convert it to heap allocated
- if (!vm_ci_markable(ci)) {
- ci = vm_ci_new_runtime(
- vm_ci_mid(ci),
- vm_ci_flag(ci),
- vm_ci_argc(ci),
- vm_ci_kwarg(ci));
- }
- argv[param_size - 1] = (VALUE)ci;
- return 0;
- }
-
  if (LIKELY(!(vm_ci_flag(ci) & VM_CALL_KW_SPLAT))) {
  if (LIKELY(rb_simple_iseq_p(iseq))) {
  rb_control_frame_t *cfp = ec->cfp;
@@ -3126,6 +3082,47 @@ vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling,
  return 0;
  }
  }
+ else if (ISEQ_BODY(iseq)->param.flags.forwardable) {
+ // Called iseq is using ... param
+ // def foo(...) # <- iseq for foo will have "forwardable"
+ //
+ // We want to set the `...` local to the caller's CI
+ // foo(1, 2) # <- the ci for this should end up as `...`
+ //
+ // So hopefully the stack looks like:
+ //
+ // => 1
+ // => 2
+ // => ... # <- points at `foo`s CI
+ // => cref_or_me
+ // => specval
+ // => type
+ //
+
+ if ((vm_ci_flag(ci) & VM_CALL_FORWARDING)) {
+ struct rb_forwarding_call_data * forward_cd = (struct rb_forwarding_call_data *)calling->cd;
+ if (vm_ci_argc(ci) != vm_ci_argc(forward_cd->caller_ci)) {
+ ci = vm_ci_new_runtime(
+ vm_ci_mid(ci),
+ vm_ci_flag(ci),
+ vm_ci_argc(ci),
+ vm_ci_kwarg(ci));
+ } else {
+ ci = forward_cd->caller_ci;
+ }
+ }
+ // C functions calling iseqs will stack allocate a CI,
+ // so we need to convert it to heap allocated
+ if (!vm_ci_markable(ci)) {
+ ci = vm_ci_new_runtime(
+ vm_ci_mid(ci),
+ vm_ci_flag(ci),
+ vm_ci_argc(ci),
+ vm_ci_kwarg(ci));
+ }
+ argv[param_size - 1] = (VALUE)ci;
+ return 0;
+ }
  }
 
  return setup_parameters_complex(ec, iseq, calling, ci, argv, arg_setup_method);