Revert "[gsharedvt] Avoid using gsharedvt trampolines for calls with a non-variable...

This reverts commit 38b6a9dffdde5ffedc2a7165b87e6df579922d5a.

Revert this as it causes failures in tests.

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index b303addc3ff40040719bae6aeaf70e19380ef086..3d3d73e5f6335d2e97df23099c680c0175f50510 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -8155,7 +8155,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        /*
                         * Making generic calls out of gsharedvt methods.
                         */
-                       if (cmethod && cfg->gsharedvt && mini_is_gsharedvt_variable_signature (fsig)) {
+                       if (cmethod && cfg->gsharedvt && mini_is_gsharedvt_signature (cfg, fsig)) {
                                MonoRgctxInfoType info_type;
 
                                if (virtual) {