[mono][aot] Avoid an assert when encoding fnptr classes. (#72479)

vargaz · web-flow · commit f098387198f4 · 2022-07-19T20:23:25.000-04:00
Fixes #72460.
diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c
@@ -3401,7 +3401,7 @@ encode_klass_ref_inner (MonoAotCompile *acfg, MonoClass *klass, guint8 *buf, gui
 					encode_klass_ref (acfg, container->owner.klass, p, &p);
 			}
 		}
-	} else if (m_class_get_byval_arg (klass)->type == MONO_TYPE_PTR) {
+	} else if (m_class_get_byval_arg (klass)->type == MONO_TYPE_PTR || m_class_get_byval_arg (klass)->type == MONO_TYPE_FNPTR) {
 		encode_value (MONO_AOT_TYPEREF_PTR, p, &p);
 		encode_type (acfg, m_class_get_byval_arg (klass), p, &p);
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -3401,7 +3401,7 @@ encode_klass_ref_inner (MonoAotCompile acfg, MonoClass klass, guint8 *buf, gui`
`3401`	`3401`	`encode_klass_ref (acfg, container->owner.klass, p, &p);`
`3402`	`3402`	`}`
`3403`	`3403`	`}`
`3404`		`- } else if (m_class_get_byval_arg (klass)->type == MONO_TYPE_PTR) {`
	`3404`	`+ } else if (m_class_get_byval_arg (klass)->type == MONO_TYPE_PTR \|\| m_class_get_byval_arg (klass)->type == MONO_TYPE_FNPTR) {`
`3405`	`3405`	`encode_value (MONO_AOT_TYPEREF_PTR, p, &p);`
`3406`	`3406`	`encode_type (acfg, m_class_get_byval_arg (klass), p, &p);`
`3407`	`3407`	`} else {`