From 02527ead60bc7d28421c6a7a67ba7521960cd64f Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Mon, 11 Oct 2010 11:15:06 +0200
Subject: [PATCH] Fix full-aot support for the stelemref wrappers.

---
 mono/mini/aot-compiler.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 0e486e5cd25..7ec5dc58b07 100644
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -1787,8 +1787,13 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8
 		}
 		case MONO_WRAPPER_WRITE_BARRIER:
 			break;
-		case MONO_WRAPPER_STELEMREF:
+		case MONO_WRAPPER_STELEMREF: {
+			MonoClass *klass = mono_marshal_get_wrapper_info (method);
+
+			/* Make sure this is the 'normal' stelemref wrapper, not the virtual one */
+			g_assert (!klass);
 			break;
+		}
 		case MONO_WRAPPER_UNKNOWN:
 			if (strcmp (method->name, "FastMonitorEnter") == 0)
 				encode_value (MONO_AOT_WRAPPER_MONO_ENTER, p, &p);
@@ -2380,6 +2385,17 @@ add_wrappers (MonoAotCompile *acfg)
 		if (method)
 			add_method (acfg, method);
 #endif
+
+		/* Stelemref wrappers */
+		/* There is only a constant number of these, iterating over all types should handle them all */
+		for (i = 0; i < acfg->image->tables [MONO_TABLE_TYPEDEF].rows; ++i) {
+			MonoClass *klass;
+		
+			token = MONO_TOKEN_TYPE_DEF | (i + 1);
+			klass = mono_class_get (acfg->image, token);
+			if (klass)
+				add_method (acfg, mono_marshal_get_virtual_stelemref (mono_array_class_get (klass, 1)));
+		}
 	}
 
 	/* 
-- 
GitLab