[interp] Step toward consolidating nonrecursive call sites (retval). (#32308)

https://github.com/mono/mono/pull/18825 was deemed too large and requested to be split up.
This is one of the required pieces.
To consolidate the multiple nonrecursive call sites requires they share the same retval variable. Go ahead and share them all.

Co-authored-by: Jay Krell <jay.krell@cornell.edu>

diff --git a/src/mono/mono/mini/interp/interp.c b/src/mono/mono/mini/interp/interp.c
index 3ee78c736ec7582b8e2430102262041ae56edc01..fe2542ad3eca20f11a6f2fce1d166cc1abf289e9 100644 (file)
--- a/src/mono/mono/mini/interp/interp.c
+++ b/src/mono/mono/mini/interp/interp.c
@@ -3771,7 +3771,6 @@ main_loop:
                }
                MINT_IN_CASE(MINT_CALLI) {
                        MonoMethodSignature *csignature;
-                       stackval *retval;
                        // FIXME This assumes a grow-down stack.
                        gpointer native_stack_addr = frame->native_stack_addr ? (gpointer)((guint8*)frame->native_stack_addr - 1) : (gpointer)&retval;
 
@@ -3839,7 +3838,6 @@ main_loop:
                        MINT_IN_BREAK;
                }
                MINT_IN_CASE(MINT_CALLI_NAT) {
-                       stackval *retval;
                        MonoMethodSignature* csignature;
 
                        frame->ip = ip;
@@ -3875,7 +3873,6 @@ main_loop:
                }
                MINT_IN_CASE(MINT_CALLVIRT_FAST)
                MINT_IN_CASE(MINT_VCALLVIRT_FAST) {
-                       stackval *retval;
                        MonoObject *this_arg;
                        is_void = *ip == MINT_VCALLVIRT_FAST;
                        int slot;
@@ -4081,7 +4078,6 @@ call:;
 #ifndef ENABLE_NETCORE
                        MonoMethod *target_method = (MonoMethod*) frame->imethod->data_items [ip [1]];
                        MonoMethodSignature *sig = (MonoMethodSignature*) frame->imethod->data_items [ip [2]];
-                       stackval *retval;
 
                        sp->data.p = vt_sp;
                        retval = sp;