From: Aleksey Kliger (λgeek) <alklig@microsoft.com>
Date: Thu, 4 Mar 2021 02:08:22 +0000 (-0500)
Subject: Fixup hot reload (#49099)
X-Git-Tag: submit/tizen/20210909.063632~2893
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=add68df26af8c0dab2afb13da1f0ca033753fd0b;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fixup hot reload (#49099)

Logic collision between e2fde0bd626e7556965f565ba17368b75d49e3c4 and e42b687ad5f3a7809b819ff86dd4e5d1909fb9a7
---

diff --git a/src/mono/mono/mini/debugger-agent.c b/src/mono/mono/mini/debugger-agent.c
index c69b23d..b3b4b60 100644
--- a/src/mono/mono/mini/debugger-agent.c
+++ b/src/mono/mono/mini/debugger-agent.c
@@ -6395,7 +6395,6 @@ static gboolean
 module_apply_changes (MonoImage *image, MonoArray *dmeta, MonoArray *dil, MonoArray *dpdb, MonoError *error)
 {
 #ifdef ENABLE_METADATA_UPDATE
-	MonoDomain *domain = mono_domain_get ();
 	/* TODO: use dpdb */
 	gpointer dmeta_bytes = (gpointer)mono_array_addr_internal (dmeta, char, 0);
 	int32_t dmeta_len = mono_array_length_internal (dmeta);
@@ -6403,7 +6402,7 @@ module_apply_changes (MonoImage *image, MonoArray *dmeta, MonoArray *dil, MonoAr
 	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);
-	mono_image_load_enc_delta (domain, image, dmeta_bytes, dmeta_len, dil_bytes, dil_len, error);
+	mono_image_load_enc_delta (image, dmeta_bytes, dmeta_len, dil_bytes, dil_len, error);
 	return is_ok (error);
 #else
 	mono_error_set_not_supported (error, "");