2009-05-16 Zoltan Varga <vargaz@gmail.com>

	* class.c (mono_class_get_vtable_entry): Avoid adding static-rgctx
	wrappers, this is now done in the JIT.

svn path=/trunk/mono/; revision=134287

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 88b87aac6f6e2b849b7a19142747be921b6d6f58..e70fb4c7ad4f1308936b306001dffa3f620298f2 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-16  Zoltan Varga  <vargaz@gmail.com>
 
+       * class.c (mono_class_get_vtable_entry): Avoid adding static-rgctx
+       wrappers, this is now done in the JIT.
+       
        * class.c (mono_set_generic_sharing_supported): New internal function.
        (mono_class_generic_sharing_enabled): Move the #ifdef stuff to the JIT.
 

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 1e4867d826c319003201614ea3bd89d374322101..a6e7e437ce5a1454899cd25d907a000cb6a58505 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -1782,12 +1782,6 @@ mono_class_get_vtable_entry (MonoClass *class, int offset)
                m = class->vtable [offset];
        }
 
-       /* 
-        * We have to add static rgctx wrappers somewhere, we do it here, 
-        * altough it should probably be done by the JIT.
-        */
-       if (mono_method_needs_static_rgctx_invoke (m, FALSE))
-               m = mono_marshal_get_static_rgctx_invoke (m);
        return m;
 }