Fixup jit table parsing after cherrypicking changes from unity-master to use existing functionality.

Author: UnityAlex

mono/metadata/domain-internals.h

@@ -551,9 +551,6 @@ mono_jit_info_table_free (MonoJitInfoTable *table);
 void
 mono_jit_info_table_add    (MonoDomain *domain, MonoJitInfo *ji);
 
-void
-mono_jit_info_table_foreach (MonoDomain *domain, MonoJitInfoFunc func, void *user_data);
-
 void
 mono_jit_info_table_remove (MonoDomain *domain, MonoJitInfo *ji);
 
@@ -670,8 +667,6 @@ void mono_assembly_cleanup_domain_bindings (guint32 domain_id);
 
 MonoJitInfo* mono_jit_info_table_find_internal (MonoDomain *domain, gpointer addr, gboolean try_aot, gboolean allow_trampolines);
 
-typedef void (*MonoJitInfoFunc) (MonoJitInfo *ji, gpointer user_data);
-
 void
 mono_jit_info_table_foreach_internal (MonoDomain *domain, MonoJitInfoFunc func, gpointer user_data);
 

mono/metadata/domain.c

@@ -1070,7 +1070,7 @@ mono_domain_ensure_entry_assembly (MonoDomain *domain, MonoAssembly *assembly)
 MONO_API void
 mono_domain_jit_foreach (MonoDomain *domain, MonoJitInfoFunc func, void *user_data)
 {
-	mono_jit_info_table_foreach (domain, func, user_data);
+	mono_jit_info_table_foreach_internal (domain, func, user_data);
 }
 
 MONO_API void

mono/metadata/icall-eventpipe.c

@@ -134,6 +134,8 @@ eventpipe_fire_method_events (
 static
 void
 eventpipe_fire_method_events_func (
+	MonoDomain *domain,
+	MonoMethod *method,
 	MonoJitInfo *ji,
 	gpointer user_data);
 
@@ -388,6 +390,8 @@ eventpipe_fire_method_events (
 static
 void
 eventpipe_fire_method_events_func (
+	MonoDomain *domain,
+	MonoMethod *method,
 	MonoJitInfo *ji,
 	gpointer user_data)
 {

mono/metadata/jit-info.c

@@ -355,7 +355,7 @@ mono_jit_info_table_foreach_internal (MonoDomain *domain, MonoJitInfoFunc func,
 				ji = (MonoJitInfo *)mono_get_hazardous_pointer ((gpointer volatile*)&chunk->data [jit_info_index], hp, JIT_INFO_HAZARD_INDEX);
 
 				if (func && !IS_JIT_INFO_TOMBSTONE (ji))
-					func (ji, user_data);
+					func (domain, ji->d.method, ji, user_data);
 
 				mono_hazard_pointer_clear (hp, JIT_INFO_HAZARD_INDEX);
 			}
@@ -805,25 +805,6 @@ mono_jit_info_table_remove (MonoDomain *domain, MonoJitInfo *ji)
  *
  *   Associate the AOT code range [start, end) with IMAGE in the JIT info table.
  */
-void
-mono_jit_info_table_foreach (MonoDomain *domain, MonoJitInfoFunc func, void *user_data)
-{
-	mono_domain_lock (domain);
-
-	MonoJitInfoTable *table = domain->jit_info_table;
-	for (int chunk_index = 0; chunk_index < table->num_chunks; ++chunk_index) {
-		for (int info_index = 0; info_index < table->chunks[chunk_index]->num_elements; ++info_index) {
-			MonoJitInfo *ji = table->chunks[chunk_index]->data[info_index];
-			if (IS_JIT_INFO_TOMBSTONE (ji) || ji->is_trampoline)
-				continue;
-
-			func (domain, ji->d.method, ji, user_data);
-		}
-	}
-
-	mono_domain_unlock (domain);
-}
-
 void
 mono_jit_info_add_aot_module (MonoImage *image, gpointer start, gpointer end)
 {