[runtime] Fix cpu usage greater than 100% error

[mono.git] / mono / mini / method-to-ir.c

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index ff72fe750f2f9bbce18c2034a0aa954fee8cd5b8..ef3090304837c0dfb8ffd2254ddcd2ee339d35e1 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -2502,15 +2502,8 @@ check_method_sharing (MonoCompile *cfg, MonoMethod *cmethod, gboolean *out_pass_
                (cmethod->klass->generic_class || cmethod->klass->generic_container)) {
                gboolean sharable = FALSE;
 
-               if (mono_method_is_generic_sharable (cmethod, TRUE)) {
+               if (mono_method_is_generic_sharable (cmethod, TRUE))
                        sharable = TRUE;
-               } else {
-                       gboolean sharing_enabled = mono_class_generic_sharing_enabled (cmethod->klass);
-                       MonoGenericContext *context = mini_class_get_context (cmethod->klass);
-                       gboolean context_sharable = mono_generic_context_is_sharable (context, TRUE);
-
-                       sharable = sharing_enabled && context_sharable;
-               }
 
                /*
                 * Pass vtable iff target method might
@@ -2530,12 +2523,6 @@ check_method_sharing (MonoCompile *cfg, MonoMethod *cmethod, gboolean *out_pass_
                if (mono_method_is_generic_sharable (cmethod, TRUE)) {
                        pass_mrgctx = TRUE;
                } else {
-                       gboolean sharing_enabled = mono_class_generic_sharing_enabled (cmethod->klass);
-                       MonoGenericContext *context = mini_method_get_context (cmethod);
-                       gboolean context_sharable = mono_generic_context_is_sharable (context, TRUE);
-
-                       if (sharing_enabled && context_sharable)
-                               pass_mrgctx = TRUE;
                        if (cfg->gsharedvt && mini_is_gsharedvt_signature (cfg, mono_method_signature (cmethod)))
                                pass_mrgctx = TRUE;
                }
@@ -11655,6 +11642,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                        }
                        EMIT_NEW_LOAD_MEMBASE (cfg, ins, OP_LOAD_MEMBASE, dreg, src->dreg, MONO_STRUCT_OFFSET (MonoTypedRef, value));
                        ins->type = STACK_MP;
+                       ins->klass = klass;
                        *sp++ = ins;
                        ip += 5;
                        break;