From 8f4020622131464435896bde4a12966224a84897 Mon Sep 17 00:00:00 2001 From: Jan Dupej Date: Fri, 2 Jun 2023 16:41:59 +0200 Subject: [PATCH 1/2] Expanding error message in #46926 --- src/mono/mono/metadata/marshal-lightweight.c | 6 +++++- src/mono/sample/wasm/wasm-nl-no-marshal | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 src/mono/sample/wasm/wasm-nl-no-marshal diff --git a/src/mono/mono/metadata/marshal-lightweight.c b/src/mono/mono/metadata/marshal-lightweight.c index a4fb731434b67..0fe4626ff6816 100644 --- a/src/mono/mono/metadata/marshal-lightweight.c +++ b/src/mono/mono/metadata/marshal-lightweight.c @@ -2504,7 +2504,11 @@ emit_managed_wrapper_ilgen (MonoMethodBuilder *mb, MonoMethodSignature *invoke_s if (!sig->hasthis && sig->param_count != invoke_sig->param_count) { /* Closed delegate */ - g_assert (sig->param_count == invoke_sig->param_count + 1); + if (sig->param_count != invoke_sig->param_count + 1) { + g_warning ("Closed delegate has incorrect number of arguments: %s.", mono_method_full_name (method, TRUE)); + g_assert_not_reached (); + } + closed = TRUE; /* Use a new signature without the first argument */ sig = mono_metadata_signature_dup (sig); diff --git a/src/mono/sample/wasm/wasm-nl-no-marshal b/src/mono/sample/wasm/wasm-nl-no-marshal new file mode 160000 index 0000000000000..35d311c0f86e5 --- /dev/null +++ b/src/mono/sample/wasm/wasm-nl-no-marshal @@ -0,0 +1 @@ +Subproject commit 35d311c0f86e556ee626ac36839fe06ed4701d34 From e878b0fed0785d5ee7a64ace986bd14eea6c99d4 Mon Sep 17 00:00:00 2001 From: Jan Dupej Date: Wed, 12 Jul 2023 12:32:10 +0200 Subject: [PATCH 2/2] Removing unnecessary code. --- src/mono/sample/wasm/wasm-nl-no-marshal | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/mono/sample/wasm/wasm-nl-no-marshal diff --git a/src/mono/sample/wasm/wasm-nl-no-marshal b/src/mono/sample/wasm/wasm-nl-no-marshal deleted file mode 160000 index 35d311c0f86e5..0000000000000 --- a/src/mono/sample/wasm/wasm-nl-no-marshal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35d311c0f86e556ee626ac36839fe06ed4701d34