Author: zoltan
Date: 2007-11-21 12:29:59 -0500 (Wed, 21 Nov 2007)
New Revision: 90096
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
Log:
2007-11-21 Zoltan Varga <[EMAIL PROTECTED]>
* method-to-ir.c (handle_unbox_nullable): Disable AOT here since we
can't encode
the method reference.
(handle_box): Ditto.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-11-21
17:27:29 UTC (rev 90095)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-11-21
17:29:59 UTC (rev 90096)
@@ -1,5 +1,9 @@
2007-11-21 Zoltan Varga <[EMAIL PROTECTED]>
+ * method-to-ir.c (handle_unbox_nullable): Disable AOT here since we
can't encode
+ the method reference.
+ (handle_box): Ditto.
+
* local-propagation.c (mono_branch_to_cmov): Implement another form
of branch->cmov conversion.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-11-21 17:27:29 UTC (rev 90095)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-11-21 17:29:59 UTC (rev 90096)
@@ -3021,6 +3021,8 @@
handle_unbox_nullable (MonoCompile* cfg, MonoInst* val, MonoClass* klass)
{
MonoMethod* method = mono_class_get_method_from_name (klass, "Unbox",
1);
+ // Can't encode method ref
+ cfg->disable_aot = TRUE;
return mono_emit_method_call (cfg, method, mono_method_signature
(method), &val, NULL);
}
@@ -3105,6 +3107,8 @@
if (mono_class_is_nullable (klass)) {
MonoMethod* method = mono_class_get_method_from_name (klass,
"Box", 1);
+ // Can't encode method ref
+ cfg->disable_aot = TRUE;
return mono_emit_method_call (cfg, method,
mono_method_signature (method), &val, NULL);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
