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 684f306d0d2bfabac80d7aae99cfdfe6a300ca5f..eed0d37c001fdd17acf3dd33cacd4f66df5294c0 160000 (submodule)
--- 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 4b49d2e9a9afe6f7223348456a68bd2544af108b..968c34ec79c99490429e0578873a53f7892411bb 100644 (file)
--- 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_) {