[mono] Move most runtime callbacks into the MonoRuntimeCallbacks structure. (#86080)

Author: vargaz

src/mono/mono/metadata/class-internals.h

@@ -687,10 +687,6 @@ typedef struct {
 
 extern MonoStats mono_stats;
 
-typedef gboolean (*MonoGetCachedClassInfo) (MonoClass *klass, MonoCachedClassInfo *res);
-
-typedef gboolean (*MonoGetClassFromName) (MonoImage *image, const char *name_space, const char *name, MonoClass **res);
-
 static inline gboolean
 method_is_dynamic (MonoMethod *method)
 {
@@ -755,12 +751,6 @@ mono_lookup_dynamic_token (MonoImage *image, guint32 token, MonoGenericContext *
 gpointer
 mono_lookup_dynamic_token_class (MonoImage *image, guint32 token, gboolean check_token, MonoClass **handle_class, MonoGenericContext *context, MonoError *error);
 
-void
-mono_install_get_cached_class_info (MonoGetCachedClassInfo func);
-
-void
-mono_install_get_class_from_name (MonoGetClassFromName func);
-
 MONO_PROFILER_API MonoGenericContext*
 mono_class_get_context (MonoClass *klass);
 

src/mono/mono/metadata/class.c

@@ -55,9 +55,6 @@ MonoStats mono_stats;
 /* Statistics */
 extern gint32 mono_inflated_methods_size;
 
-/* Function supplied by the runtime to find classes by name using information from the AOT file */
-static MonoGetClassFromName get_class_from_name = NULL;
-
 static gboolean can_access_type (MonoClass *access_klass, MonoClass *member_klass);
 
 static char* mono_assembly_name_from_token (MonoImage *image, guint32 type_token);
@@ -3317,8 +3314,8 @@ mono_class_from_name_checked_aux (MonoImage *image, const char* name_space, cons
 
 	/* FIXME: get_class_from_name () can't handle types in the EXPORTEDTYPE table */
 	// The AOT cache in get_class_from_name is case-sensitive, so don't bother with it for case-insensitive lookups
-	if (get_class_from_name && table_info_get_rows (&image->tables [MONO_TABLE_EXPORTEDTYPE]) == 0 && case_sensitive) {
-		gboolean res = get_class_from_name (image, name_space, name, &klass);
+	if (table_info_get_rows (&image->tables [MONO_TABLE_EXPORTEDTYPE]) == 0 && case_sensitive) {
+		gboolean res = mono_get_runtime_callbacks ()->get_class_from_name (image, name_space, name, &klass);
 		if (res) {
 			if (!klass) {
 				klass = search_modules (image, name_space, name, case_sensitive, error);
@@ -4798,27 +4795,10 @@ mono_lookup_dynamic_token_class (MonoImage *image, guint32 token, gboolean valid
 	return mono_reflection_lookup_dynamic_token (image, token, valid_token, handle_class, context, error);
 }
 
-static MonoGetCachedClassInfo get_cached_class_info = NULL;
-
-void
-mono_install_get_cached_class_info (MonoGetCachedClassInfo func)
-{
-	get_cached_class_info = func;
-}
-
 gboolean
 mono_class_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res)
 {
-	if (!get_cached_class_info)
-		return FALSE;
-	else
-		return get_cached_class_info (klass, res);
-}
-
-void
-mono_install_get_class_from_name (MonoGetClassFromName func)
-{
-	get_class_from_name = func;
+	return mono_get_runtime_callbacks ()->get_cached_class_info (klass, res);
 }
 
 /**

src/mono/mono/metadata/jit-info.c

@@ -45,7 +45,6 @@
 #include <mono/metadata/profiler-private.h>
 #include <mono/metadata/coree.h>
 
-static MonoJitInfoFindInAot jit_info_find_in_aot_func = NULL;
 static MonoJitInfoTable * volatile jit_info_table;
 static MonoJitInfoTable * volatile aot_modules;
 static GSList *jit_info_free_queue;
@@ -327,7 +326,7 @@ mono_jit_info_table_find_internal (gpointer addr, gboolean try_aot, gboolean all
 		table = (MonoJitInfoTable *)mono_get_hazardous_pointer ((gpointer volatile*)&aot_modules, hp, JIT_INFO_TABLE_HAZARD_INDEX);
 		module_ji = jit_info_table_find (table, hp, (gint8*)addr);
 		if (module_ji)
-			ji = jit_info_find_in_aot_func (module_ji->d.image, addr);
+			ji = mono_get_runtime_callbacks ()->find_jit_info_in_aot (module_ji->d.image, addr);
 		if (hp)
 			mono_hazard_pointer_clear (hp, JIT_INFO_TABLE_HAZARD_INDEX);
 	}
@@ -825,12 +824,6 @@ mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end)
 	jit_info_unlock ();
 }
 
-void
-mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func)
-{
-	jit_info_find_in_aot_func = func;
-}
-
 int
 mono_jit_info_size (MonoJitInfoFlags flags, int num_clauses, int num_holes)
 {

src/mono/mono/metadata/jit-info.h

@@ -278,13 +278,6 @@ mono_jit_info_get_thunk_info (MonoJitInfo *ji);
 MonoUnwindJitInfo*
 mono_jit_info_get_unwind_info (MonoJitInfo *ji);
 
-/*
- * Installs a new function which is used to return a MonoJitInfo for a method inside
- * an AOT module.
- */
-typedef MonoJitInfo *(*MonoJitInfoFindInAot)         (MonoImage *image, gpointer addr);
-void          mono_install_jit_info_find_in_aot (MonoJitInfoFindInAot func);
-
 MONO_PROFILER_API MonoJitInfo* mono_jit_info_table_find_internal (gpointer addr, gboolean try_aot, gboolean allow_trampolines);
 
 typedef void (*MonoJitInfoFunc) (MonoJitInfo *ji, gpointer user_data);

src/mono/mono/metadata/object-internals.h

@@ -666,6 +666,40 @@ TYPED_HANDLE_DECL (MonoDelegate);
 
 typedef void (*InterpJitInfoFunc) (MonoJitInfo *ji, gpointer user_data);
 
+#ifdef MONO_SMALL_CONFIG
+#define MONO_IMT_SIZE 9
+#else
+#define MONO_IMT_SIZE 19
+#endif
+
+typedef union {
+	int vtable_slot;
+	gpointer target_code;
+} MonoImtItemValue;
+
+typedef struct _MonoImtBuilderEntry {
+	gpointer key;
+	struct _MonoImtBuilderEntry *next;
+	MonoImtItemValue value;
+	int children;
+	guint8 has_target_code : 1;
+} MonoImtBuilderEntry;
+
+typedef struct _MonoIMTCheckItem MonoIMTCheckItem;
+
+struct _MonoIMTCheckItem {
+	gpointer          key;
+	int               check_target_idx;
+	MonoImtItemValue  value;
+	guint8           *jmp_code;
+	guint8           *code_target;
+	guint8            is_equals;
+	guint8            compare_done;
+	guint8            chunk_size;
+	guint8            short_branch;
+	guint8            has_target_code;
+};
+
 /*
  * Callbacks supplied by the runtime and called by the modules in metadata/
  * This interface is easier to extend than adding a new function type +
@@ -704,6 +738,10 @@ typedef struct {
 	MonoBoolean (*get_frame_info) (gint32 skip, MonoMethod **out_method,
 								   MonoDebugSourceLocation **out_location,
 								   gint32 *iloffset, gint32 *native_offset);
+	gboolean (*get_cached_class_info) (MonoClass *klass, MonoCachedClassInfo *res);
+	gboolean (*get_class_from_name) (MonoImage *image, const char *name_space, const char *name, MonoClass **res);
+	gpointer (*build_imt_trampoline) (MonoVTable *vtable, MonoIMTCheckItem **imt_entries, int count, gpointer fail_trunk);
+	MonoJitInfo *(*find_jit_info_in_aot) (MonoImage *image, gpointer addr);
 } MonoRuntimeCallbacks;
 
 typedef gboolean (*MonoInternalStackWalk) (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data);
@@ -1579,45 +1617,6 @@ mono_nullable_box_handle (gpointer buf, MonoClass *klass, MonoError *error);
 MonoObjectHandle
 mono_new_null (void);
 
-#ifdef MONO_SMALL_CONFIG
-#define MONO_IMT_SIZE 9
-#else
-#define MONO_IMT_SIZE 19
-#endif
-
-typedef union {
-	int vtable_slot;
-	gpointer target_code;
-} MonoImtItemValue;
-
-typedef struct _MonoImtBuilderEntry {
-	gpointer key;
-	struct _MonoImtBuilderEntry *next;
-	MonoImtItemValue value;
-	int children;
-	guint8 has_target_code : 1;
-} MonoImtBuilderEntry;
-
-typedef struct _MonoIMTCheckItem MonoIMTCheckItem;
-
-struct _MonoIMTCheckItem {
-	gpointer          key;
-	int               check_target_idx;
-	MonoImtItemValue  value;
-	guint8           *jmp_code;
-	guint8           *code_target;
-	guint8            is_equals;
-	guint8            compare_done;
-	guint8            chunk_size;
-	guint8            short_branch;
-	guint8            has_target_code;
-};
-
-typedef gpointer (*MonoImtTrampolineBuilder) (MonoVTable *vtable, MonoIMTCheckItem **imt_entries, int count, gpointer fail_trunk);
-
-void
-mono_install_imt_trampoline_builder (MonoImtTrampolineBuilder func);
-
 void
 mono_set_always_build_imt_trampolines (gboolean value);
 

src/mono/mono/metadata/object.c

@@ -701,7 +701,6 @@ mono_release_type_locks (MonoInternalThread *thread)
 	mono_type_initialization_unlock ();
 }
 
-static MonoImtTrampolineBuilder imt_trampoline_builder;
 static gboolean always_build_imt_trampolines;
 
 #if (MONO_IMT_SIZE > 32)
@@ -720,12 +719,6 @@ mono_get_runtime_callbacks (void)
 	return &callbacks;
 }
 
-void
-mono_install_imt_trampoline_builder (MonoImtTrampolineBuilder func)
-{
-	imt_trampoline_builder = func;
-}
-
 void
 mono_set_always_build_imt_trampolines (gboolean value)
 {
@@ -1480,7 +1473,7 @@ initialize_imt_slot (MonoVTable *vtable, MonoImtBuilderEntry *imt_builder_entry,
 			/* Collision, build the trampoline */
 			GPtrArray *imt_ir = imt_sort_slot_entries (imt_builder_entry);
 			gpointer result;
-			result = imt_trampoline_builder (vtable,
+			result = mono_get_runtime_callbacks ()->build_imt_trampoline (vtable,
 				(MonoIMTCheckItem**)imt_ir->pdata, imt_ir->len, fail_tramp);
 			for (guint i = 0; i < imt_ir->len; ++i)
 				g_free (g_ptr_array_index (imt_ir, i));
@@ -1829,8 +1822,8 @@ mono_method_add_generic_virtual_invocation (MonoVTable *vtable,
 
 			sorted = imt_sort_slot_entries (entries);
 
-			*vtable_slot = imt_trampoline_builder (vtable, (MonoIMTCheckItem**)sorted->pdata, sorted->len,
-												   vtable_trampoline);
+			*vtable_slot = mono_get_runtime_callbacks ()->build_imt_trampoline (vtable, (MonoIMTCheckItem**)sorted->pdata, sorted->len,
+																				vtable_trampoline);
 
 			while (entries) {
 				MonoImtBuilderEntry *next = entries->next;

src/mono/mono/mini/mini-runtime.c

@@ -4557,7 +4557,7 @@ mini_init (const char *filename)
 #if ENABLE_WEAK_ATTR
 	callbacks.get_weak_field_indexes = mono_aot_get_weak_field_indexes;
 #endif
-
+	callbacks.find_jit_info_in_aot = mono_aot_find_jit_info;
 	callbacks.metadata_update_published = mini_invalidate_transformed_interp_methods;
 	callbacks.interp_jit_info_foreach = mini_interp_jit_info_foreach;
 	callbacks.interp_sufficient_stack = mini_interp_sufficient_stack;
@@ -4569,6 +4569,17 @@ mini_init (const char *filename)
 	callbacks.init_class = init_class;
 	callbacks.get_trace = mono_get_trace;
 	callbacks.get_frame_info = mono_get_frame_info;
+	callbacks.get_cached_class_info = mono_aot_get_cached_class_info;
+	callbacks.get_class_from_name = mono_aot_get_class_from_name;
+
+	if (mono_llvm_only) {
+		callbacks.build_imt_trampoline = mini_llvmonly_get_imt_trampoline;
+		mono_set_always_build_imt_trampolines (TRUE);
+	} else if (mono_aot_only) {
+		callbacks.build_imt_trampoline = mono_aot_get_imt_trampoline;
+	} else {
+		callbacks.build_imt_trampoline = mono_arch_build_imt_trampoline;
+	}
 
 	mono_install_callbacks (&callbacks);
 
@@ -4638,10 +4649,6 @@ mini_init (const char *filename)
 #endif
 	mono_threads_install_cleanup (mini_thread_cleanup);
 
-	mono_install_get_cached_class_info (mono_aot_get_cached_class_info);
-	mono_install_get_class_from_name (mono_aot_get_class_from_name);
-	mono_install_jit_info_find_in_aot (mono_aot_find_jit_info);
-
 	mono_profiler_state.context_enable = mini_profiler_context_enable;
 	mono_profiler_state.context_get_this = mini_profiler_context_get_this;
 	mono_profiler_state.context_get_argument = mini_profiler_context_get_argument;
@@ -4690,15 +4697,6 @@ mini_init (const char *filename)
 		mono_marshal_use_aot_wrappers (TRUE);
 	}
 
-	if (mono_llvm_only) {
-		mono_install_imt_trampoline_builder (mini_llvmonly_get_imt_trampoline);
-		mono_set_always_build_imt_trampolines (TRUE);
-	} else if (mono_aot_only) {
-		mono_install_imt_trampoline_builder (mono_aot_get_imt_trampoline);
-	} else {
-		mono_install_imt_trampoline_builder (mono_arch_build_imt_trampoline);
-	}
-
 	/*Init arch tls information only after the metadata side is inited to make sure we see dynamic appdomain tls keys*/
 	mono_arch_finish_init ();