Refactor.

Author: sisshiki1969

monoruby/src/compiler/runtime.rs

@@ -304,14 +304,7 @@ pub(super) extern "C" fn vm_handle_arguments(
     callid: CallSiteId,
 ) -> Option<Value> {
     let caller_lfp = vm.cfp().lfp();
-    match set_frame_arguments(
-        globals,
-        callee_lfp,
-        caller_lfp,
-        callid,
-        src,
-        globals.store[callid].pos_num,
-    ) {
+    match set_frame_arguments(globals, callee_lfp, caller_lfp, callid) {
         Ok(_) => {
             set_frame_block(&globals.store[callid], callee_lfp, caller_lfp);
             Some(Value::nil())
@@ -331,14 +324,7 @@ pub(super) extern "C" fn jit_handle_arguments_no_block(
     callid: CallSiteId,
 ) -> Option<Value> {
     let caller_lfp = vm.cfp().lfp();
-    match set_frame_arguments(
-        globals,
-        callee_lfp,
-        caller_lfp,
-        callid,
-        src,
-        globals.store[callid].pos_num,
-    ) {
+    match set_frame_arguments(globals, callee_lfp, caller_lfp, callid) {
         Ok(_) => Some(Value::nil()),
         Err(err) => {
             vm.set_error(err);

monoruby/src/compiler/runtime/args.rs

@@ -76,14 +76,12 @@ pub(crate) fn set_frame_arguments(
     callee_lfp: Lfp,
     caller_lfp: Lfp,
     callid: CallSiteId,
-    src: *const Value,
-    pos_num: usize,
 ) -> Result<()> {
     let callee_fid = callee_lfp.meta().func_id();
     let callee = &globals.store[callee_fid];
     let caller = &globals.store[callid];
 
-    positional(caller, callee, src, pos_num, callee_lfp, caller_lfp)?;
+    positional(caller, callee, callee_lfp, caller_lfp)?;
     if !callee.no_keyword() || !caller.kw_may_exists() {
         handle_keyword(callee, caller, callee_lfp, caller_lfp)?;
     }
@@ -158,7 +156,7 @@ pub(crate) extern "C" fn jit_generic_set_arguments(
     let caller = &globals.store[caller];
     let callee_fid = meta.func_id();
     let callee = &globals.store[callee_fid];
-    match positional(caller, callee, src, caller.pos_num, callee_lfp, caller_lfp) {
+    match positional(caller, callee, callee_lfp, caller_lfp) {
         Ok(_) => Some(Value::nil()),
         Err(err) => {
             vm.set_error(err);
@@ -173,15 +171,15 @@ pub(crate) extern "C" fn jit_generic_set_arguments(
 fn positional(
     caller: &CallSiteInfo,
     callee: &FuncInfo,
-    src: *const Value,
-    pos_num: usize,
     mut callee_lfp: Lfp,
     caller_lfp: Lfp,
 ) -> Result<()> {
     let max_pos = callee.max_positional_args();
     let no_push = callee.discard_excess_positional_args();
     let splat_pos = &caller.splat_pos;
+    let src = caller_lfp.register_ptr(caller.args.0 as usize) as _;
     let dst = callee_lfp.register_ptr(1) as *mut Value;
+    let pos_num = caller.pos_num;
 
     let ex = if callee.no_keyword() && caller.kw_may_exists() {
         // handle excessive keyword arguments