[mono] Fix full aot compilation on android+x86. (#52816)

Fixes #50493.
dotnet · May 15, 2021 · 6430375 · 6430375
1 parent 7db5438
commit 6430375
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/mono/mono/metadata/marshal-ilgen.c b/src/mono/mono/metadata/marshal-ilgen.c
@@ -1579,6 +1579,7 @@ emit_invoke_call (MonoMethodBuilder *mb, MonoMethod *method,
 		case MONO_TYPE_CLASS:  
 		case MONO_TYPE_ARRAY:
 		case MONO_TYPE_PTR:
+		case MONO_TYPE_FNPTR:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_OBJECT:
 			mono_mb_emit_byte (mb, mono_type_to_ldind (sig->params [i]));

diff --git a/src/mono/mono/mini/mini-x86.c b/src/mono/mono/mini/mini-x86.c
@@ -6312,8 +6312,8 @@ mono_arch_emit_load_got_addr (guint8 *start, guint8 *code, MonoCompile *cfg, Mon
 		*ji = mono_patch_info_list_prepend (*ji, code - start, MONO_PATCH_INFO_GOT_OFFSET, NULL);
 	x86_pop_reg (code, MONO_ARCH_GOT_REG);
 	x86_alu_reg_imm (code, X86_ADD, MONO_ARCH_GOT_REG, 0xf0f0f0f0);
-
-	set_code_cursor (cfg, code);
+	if (cfg)
+		set_code_cursor (cfg, code);
 	return code;
 }