[mono][aot] Avoid compiling the same method multiple times during dedup. (#92178)

github-actions[bot] · vargaz · web-flow · commit ae998ebf0071 · 2023-09-18T10:21:39.000-07:00
Co-authored-by: Zoltan Varga &lt;vargaz@gmail.com&gt;
diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c
@@ -4326,6 +4326,7 @@ get_method_index (MonoAotCompile *acfg, MonoMethod *method)
 	return index - 1;
 }
 
+/* Return TRUE if the method can be skipped */
 static gboolean
 collect_dedup_method (MonoAotCompile *acfg, MonoMethod *method)
 {
@@ -4334,14 +4335,16 @@ collect_dedup_method (MonoAotCompile *acfg, MonoMethod *method)
 		if (acfg->dedup_phase == DEDUP_SKIP)
 			return TRUE;
 		// Remember for later
-		if (acfg->dedup_phase == DEDUP_COLLECT && !g_hash_table_lookup (dedup_methods, method))
+		g_assert (acfg->dedup_phase == DEDUP_COLLECT);
+		if (!g_hash_table_lookup (dedup_methods, method))
 			g_hash_table_insert (dedup_methods, method, method);
+		else
+			// Already processed when compiling another assembly
+			return TRUE;
 	}
 	return FALSE;
 }
 
-
-
 static int
 add_method_full (MonoAotCompile *acfg, MonoMethod *method, gboolean extra, int depth)
 {

Original file line number	Diff line number	Diff line change
`@@ -4326,6 +4326,7 @@ get_method_index (MonoAotCompile acfg, MonoMethod method)`
`4326`	`4326`	`return index - 1;`
`4327`	`4327`	`}`
`4328`	`4328`
	`4329`	`+/* Return TRUE if the method can be skipped */`
`4329`	`4330`	`static gboolean`
`4330`	`4331`	`collect_dedup_method (MonoAotCompile acfg, MonoMethod method)`
`4331`	`4332`	`{`
`@@ -4334,14 +4335,16 @@ collect_dedup_method (MonoAotCompile acfg, MonoMethod method)`
`4334`	`4335`	`if (acfg->dedup_phase == DEDUP_SKIP)`
`4335`	`4336`	`return TRUE;`
`4336`	`4337`	`// Remember for later`
`4337`		`- if (acfg->dedup_phase == DEDUP_COLLECT && !g_hash_table_lookup (dedup_methods, method))`
	`4338`	`+ g_assert (acfg->dedup_phase == DEDUP_COLLECT);`
	`4339`	`+ if (!g_hash_table_lookup (dedup_methods, method))`
`4338`	`4340`	`g_hash_table_insert (dedup_methods, method, method);`
	`4341`	`+ else`
	`4342`	`+ // Already processed when compiling another assembly`
	`4343`	`+ return TRUE;`
`4339`	`4344`	`}`
`4340`	`4345`	`return FALSE;`
`4341`	`4346`	`}`
`4342`	`4347`
`4343`		`-`
`4344`		`-`
`4345`	`4348`	`static int`
`4346`	`4349`	`add_method_full (MonoAotCompile acfg, MonoMethod method, gboolean extra, int depth)`
`4347`	`4350`	`{`