Fix full-aot support for unmanaged function pointers. (#44783)

Fixes https://github.com/dotnet/runtime/issues/44779.

diff --git a/src/mono/mono/mini/aot-compiler.c b/src/mono/mono/mini/aot-compiler.c
index a66eeb8..2eca80f 100644 (file)
--- a/src/mono/mono/mini/aot-compiler.c
+++ b/src/mono/mono/mini/aot-compiler.c
@@ -5054,6 +5054,19 @@ MONO_RESTORE_WARNING
                                if (export_name)
                                        g_hash_table_insert (acfg->export_names, wrapper, export_name);
                        }
+
+#ifdef ENABLE_NETCORE
+                       for (j = 0; j < cattr->num_attrs; ++j)
+                               if (cattr->attrs [j].ctor && mono_is_corlib_image (m_class_get_image (cattr->attrs [j].ctor->klass)) && !strcmp (m_class_get_name (cattr->attrs [j].ctor->klass), "UnmanagedCallersOnlyAttribute"))
+                                       break;
+                       if (j < cattr->num_attrs) {
+                               MonoMethod *wrapper = mono_marshal_get_managed_wrapper (method, NULL, 0, error);
+                               mono_error_assert_ok (error);
+
+                               add_method (acfg, wrapper);
+                       }
+#endif
+
                        g_free (cattr);
                }
 
@@ -8484,6 +8497,7 @@ can_encode_method (MonoAotCompile *acfg, MonoMethod *method)
                        case MONO_WRAPPER_MANAGED_TO_NATIVE:
                                break;
                        case MONO_WRAPPER_MANAGED_TO_MANAGED:
+                       case MONO_WRAPPER_NATIVE_TO_MANAGED:
                        case MONO_WRAPPER_CASTCLASS: {
                                WrapperInfo *info = mono_marshal_get_wrapper_info (method);