diff options
author | Esme <madewokherd@gmail.com> | 2021-05-04 16:37:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-04 16:37:26 +0300 |
commit | 3ffd8fd46b4a50039ba6e3888f71b13845ada4c9 (patch) | |
tree | b46132905791029442758f7c93465affdd8913a7 /mono | |
parent | bb4af41b62743cbdc5d751b91e95ea9352996c19 (diff) |
Remove !sig->is_inflated assert from icall wrapper generator. (#21046)
If the method or type containing the icall instruction has a
generic parameter, the resulting signature is "inflated" even if
the generic parameter is not used in the signature. This breaks
some methods in SlimDX, and probably other C++/CLI code.
Co-authored-by: Esme Povirk <esme@codeweavers.com>
Diffstat (limited to 'mono')
-rw-r--r-- | mono/metadata/marshal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 3c3ea52fa52..f75f843df03 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -3686,7 +3686,7 @@ mono_marshal_get_native_func_wrapper_indirect (MonoClass *caller_class, MonoMeth MonoImage *image = m_class_get_image (caller_class); g_assert (sig->pinvoke); g_assert (!sig->hasthis && ! sig->explicit_this); - g_assert (!sig->is_inflated && !sig->has_type_parameters); + g_assert (!sig->has_type_parameters); #if 0 /* |