From: Aleksey Kliger (λgeek) <akliger@gmail.com>
Date: Fri, 9 Jun 2017 17:40:28 +0000 (-0400)
Subject: Merge pull request #4997 from lambdageek/bug-57222
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=417389513fcf3eb689716805bfcd1cc6e7da57b7;hp=dd0eab4247bf5c427471fd450b9e7400b1a9a7b1;p=mono.git

Merge pull request #4997 from lambdageek/bug-57222

[sre] FieldBuilder:RuntimeResolve shouldn't lookup by name (Fixes #57222)
---

diff --git a/external/corefx b/external/corefx
index 684f306d0d2..eed0d37c001 160000
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit 684f306d0d2bfabac80d7aae99cfdfe6a300ca5f
+Subproject commit eed0d37c001fdd17acf3dd33cacd4f66df5294c0
diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 4b49d2e9a9a..968c34ec79c 100644
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -4028,8 +4028,10 @@ emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
 
 	/* to make it work with our special string constructors */
 	if (!string_dummy) {
+		MonoError error;
 		MONO_GC_REGISTER_ROOT_SINGLE (string_dummy, MONO_ROOT_SOURCE_MARSHAL, "dummy marshal string");
-		string_dummy = mono_string_new_wrapper ("dummy");
+		string_dummy = mono_string_new_checked (mono_get_root_domain (), "dummy", &error);
+		mono_error_assert_ok (&error);
 	}
 
 	if (virtual_) {