Merge pull request #2005 from Unity-Technologies/2023.3/platform/wind…

…ows/uum-62035 2023.3/platform/windows/uum-62035 to unity-2023.3-mbe
Unity-Technologies · Mar 24, 2024 · 780f79f · 780f79f
2 parents c869ed8 + 103c7b0
commit 780f79f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mono/metadata/marshal-ilgen.c b/mono/metadata/marshal-ilgen.c
@@ -2156,7 +2156,12 @@ emit_native_wrapper_ilgen (MonoImage *image, MonoMethodBuilder *mb, MonoMethodSi
 		mono_mb_emit_calli (mb, csig);
 	} else if (MONO_CLASS_IS_IMPORT (mb->method->klass)) {
 #ifndef DISABLE_COM
-		mono_mb_emit_ldloc (mb, gc_safe_transition_builder.coop_cominterop_fnptr);
+		if (need_gc_safe) {
+			mono_mb_emit_ldloc (mb, gc_safe_transition_builder.coop_cominterop_fnptr);
+		} else {
+			mono_mb_emit_cominterop_get_function_pointer (mb, &piinfo->method);
+		}
+
 		if (piinfo->piflags & PINVOKE_ATTRIBUTE_SUPPORTS_LAST_ERROR) {
 			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
 			mono_mb_emit_byte (mb, CEE_MONO_SAVE_LAST_ERROR);