Fix AOT support for OP_GC_CARD_TABLE on amd64.

a5e13730 · Zoltan Varga · b07a3824 · a5e13730
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

mono/mini/mini-amd64.c mono/mini/mini-amd64.c +3 -1

未找到文件。
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -6632,9 +6632,11 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
 			break;
 		}
 		case MONO_PATCH_INFO_GC_CARD_TABLE_ADDR: {
-			/*FIXME handle AOT - we should not patch there in that case. Reuse is cool since we don't mix code that requires it during AOT with code that doesn't. */
 			guint8 *pos;

+			if (cfg->compile_aot)
+				continue;
+
 			/*loading is faster against aligned addresses.*/
 			code = (guint8*)ALIGN_TO (code, 8);