From 09a1e77f440b478e212195f0d6a4c8fa2564e825 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 8 Jan 2021 14:03:42 -0500 Subject: [PATCH] Fix void returns in llvmonly runtime invokes. (#46735) --- src/mono/mono/mini/mini-runtime.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index ca227b4..2910d1a 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -3205,10 +3205,14 @@ mono_llvmonly_runtime_invoke (MonoMethod *method, RuntimeInvokeInfo *info, void if (exc && *exc) return NULL; - if (sig->ret->type != MONO_TYPE_VOID && info->ret_box_class) - return mono_value_box_checked (domain, info->ret_box_class, retval, error); - else - return *(MonoObject**)retval; + if (sig->ret->type != MONO_TYPE_VOID) { + if (info->ret_box_class) + return mono_value_box_checked (domain, info->ret_box_class, retval, error); + else + return *(MonoObject**)retval; + } else { + return NULL; + } } /** -- 2.7.4