From 4671f2f5ae1594df201a49f489b2e837165c7eee Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Tue, 30 Mar 2021 15:51:26 -0400 Subject: [PATCH 1/2] [mbr] Turn on hot reload for iOS, tvOS and MacCatalyst --- src/mono/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 44e5514d6dca7..36fb3de4103c8 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -64,6 +64,7 @@ true + true false From 972e9bdf9acbc10e9e2bd41479a942d5ef4a3786 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Wed, 31 Mar 2021 08:59:43 -0400 Subject: [PATCH 2/2] [mbr] Mark some unused variables with G_GNUC_UNUSED Fixes build on MacCatalyst --- src/mono/mono/mini/debugger-agent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/mono/mini/debugger-agent.c b/src/mono/mono/mini/debugger-agent.c index aefee620f3307..67d393b1bb6e0 100644 --- a/src/mono/mono/mini/debugger-agent.c +++ b/src/mono/mono/mini/debugger-agent.c @@ -6422,8 +6422,8 @@ module_apply_changes (MonoImage *image, MonoArray *dmeta, MonoArray *dil, MonoAr int32_t dmeta_len = mono_array_length_internal (dmeta); gpointer dil_bytes = (gpointer)mono_array_addr_internal (dil, char, 0); int32_t dil_len = mono_array_length_internal (dil); - gpointer dpdb_bytes = !dpdb ? NULL : (gpointer)mono_array_addr_internal (dpdb, char, 0); - int32_t dpdb_len = !dpdb ? 0 : mono_array_length_internal (dpdb); + gpointer dpdb_bytes G_GNUC_UNUSED = !dpdb ? NULL : (gpointer)mono_array_addr_internal (dpdb, char, 0); + int32_t dpdb_len G_GNUC_UNUSED = !dpdb ? 0 : mono_array_length_internal (dpdb); mono_image_load_enc_delta (image, dmeta_bytes, dmeta_len, dil_bytes, dil_len, error); return is_ok (error); #else