Revert "[jit] Avoid generating remoting invoke wrappers for icalls."
authorZoltan Varga <vargaz@gmail.com>
Mon, 13 Apr 2015 02:43:02 +0000 (22:43 -0400)
committerZoltan Varga <vargaz@gmail.com>
Mon, 13 Apr 2015 02:43:02 +0000 (22:43 -0400)
This reverts commit 4f124705ac70df7cf8b2db0c01602b32e117d272.

Revert this as it causes corlib test failures.

mono/mini/method-to-ir.c

index 60ae6aabb44d2fce8e02eb476dd92e4161ad5077..0f5e45ad93fa98b40fea13a538e791e65f619430 100755 (executable)
@@ -2872,7 +2872,7 @@ mono_emit_method_call_full (MonoCompile *cfg, MonoMethod *method, MonoMethodSign
                         * and then we can call the method directly.
                         */
 #ifndef DISABLE_REMOTING
-                       if ((mono_class_is_marshalbyref (method->klass) || method->klass == mono_defaults.object_class) && !(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)) {
+                       if (mono_class_is_marshalbyref (method->klass) || method->klass == mono_defaults.object_class) {
                                /* 
                                 * The check above ensures method is not gshared, this is needed since
                                 * gshared methods can't have wrappers.