From: Jay Krell <jaykrell@microsoft.com>
Date: Mon, 19 Aug 2019 09:50:20 +0000 (-0700)
Subject: [interp] Remove InterpFrame.locals, replace with reasonably efficient frame_locals... 
X-Git-Tag: submit/tizen/20210909.063632~10331^2~5^2~748
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc18e011ae040d6e8aad7babad7d98a5f5adc677;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[interp] Remove InterpFrame.locals, replace with reasonably efficient frame_locals macro.o (mono/mono#16317)

Contributes to mono/mono#16172.

Commit migrated from https://github.com/mono/mono/commit/8886f71b2cb957cdf3f967d8251ec9a6102e358f
---

diff --git a/src/mono/mono/mini/interp/interp-internals.h b/src/mono/mono/mini/interp/interp-internals.h
index 4037018..772a126 100644
--- a/src/mono/mono/mini/interp/interp-internals.h
+++ b/src/mono/mono/mini/interp/interp-internals.h
@@ -134,7 +134,6 @@ struct _InterpFrame {
 	char           *varargs;
 	stackval       *stack_args; /* parent */
 	stackval       *stack;
-	unsigned char  *locals;
 	/*
 	 * For GC tracking of local objrefs in exec_method ().
 	 * Storing into this field will keep the object pinned
@@ -148,6 +147,8 @@ struct _InterpFrame {
 	MonoException     *ex;
 };
 
+#define frame_locals(frame) (((guchar*)((frame)->stack)) + (frame)->imethod->stack_size + (frame)->imethod->vt_stack_size)
+
 typedef struct {
 	/* Resume state for resuming execution in mixed mode */
 	gboolean       has_resume_state;
diff --git a/src/mono/mono/mini/interp/interp.c b/src/mono/mono/mini/interp/interp.c
index b039fe7..2be498d 100644
--- a/src/mono/mono/mini/interp/interp.c
+++ b/src/mono/mono/mini/interp/interp.c
@@ -3246,8 +3246,7 @@ interp_exec_method_full (InterpFrame *frame, ThreadContext *context, FrameClause
 #if DEBUG_INTERP
 	vtalloc = vt_sp;
 #endif
-	locals = (unsigned char *) vt_sp + imethod->vt_stack_size;
-	frame->locals = locals;
+	locals = frame_locals (frame);
 	child_frame.parent = frame;
 
 	if (clause_args && clause_args->filter_exception) {
@@ -3268,7 +3267,7 @@ main_loop:
 		DUMP_INSTR();
 		MINT_IN_SWITCH (*ip) {
 		MINT_IN_CASE(MINT_INITLOCALS)
-			memset (locals, 0, imethod->locals_size);
+			memset (frame_locals (frame), 0, imethod->locals_size);
 			++ip;
 			MINT_IN_BREAK;
 		MINT_IN_CASE(MINT_NOP)
@@ -3431,8 +3430,7 @@ main_loop:
 #if DEBUG_INTERP
 			vtalloc = vt_sp;
 #endif
-			locals = vt_sp + imethod->vt_stack_size;
-			frame->locals = locals;
+			locals = frame_locals (frame);
 			ip = imethod->code;
 			MINT_IN_BREAK;
 		}
@@ -6495,7 +6493,7 @@ main_loop:
 #endif
 	   MINT_IN_CASE(MINT_RETHROW) {
 			int exvar_offset = *(guint16*)(ip + 1);
-			THROW_EX_GENERAL (*(MonoException**)(frame->locals + exvar_offset), ip, TRUE);
+			THROW_EX_GENERAL (*(MonoException**)(frame_locals (frame) + exvar_offset), ip, TRUE);
 			MINT_IN_BREAK;
 	   }
 	   MINT_IN_CASE(MINT_MONO_RETHROW) {
@@ -6678,7 +6676,7 @@ interp_set_resume_state (MonoJitTlsData *jit_tls, MonoException *ex, MonoJitExce
 	context->handler_frame->ex = ex;
 	/* Ditto */
 	if (ei)
-		*(MonoException**)(context->handler_frame->locals + ei->exvar_offset) = ex;
+		*(MonoException**)(frame_locals (context->handler_frame) + ei->exvar_offset) = ex;
 	context->handler_ip = (guint16*) handler_ip;
 }
 
@@ -6885,7 +6883,7 @@ interp_frame_get_local (MonoInterpFrameHandle frame, int pos)
 
 	g_assert (iframe->imethod);
 
-	return iframe->locals + iframe->imethod->local_offsets [pos];
+	return frame_locals (iframe) + iframe->imethod->local_offsets [pos];
 }
 
 static gpointer