[mono] Avoid a JIT assert. (#58071)

Workaround for #57560.
dotnet · Aug 25, 2021 · 8455a5e · 8455a5e
1 parent 3633a7d
commit 8455a5e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c
@@ -5322,20 +5322,20 @@ handle_call_res_devirt (MonoCompile *cfg, MonoMethod *cmethod, MonoInst *call_re
 			MonoClass *gcomparer = mono_class_get_geqcomparer_class ();
 			g_assert (gcomparer);
 			gcomparer_inst = mono_class_inflate_generic_class_checked (gcomparer, &ctx, error);
-			mono_error_assert_ok (error);
+			if (is_ok (error)) {
+				MONO_INST_NEW (cfg, typed_objref, OP_TYPED_OBJREF);
+				typed_objref->type = STACK_OBJ;
+				typed_objref->dreg = alloc_ireg_ref (cfg);
+				typed_objref->sreg1 = call_res->dreg;
+				typed_objref->klass = gcomparer_inst;
+				MONO_ADD_INS (cfg->cbb, typed_objref);
 
-			MONO_INST_NEW (cfg, typed_objref, OP_TYPED_OBJREF);
-			typed_objref->type = STACK_OBJ;
-			typed_objref->dreg = alloc_ireg_ref (cfg);
-			typed_objref->sreg1 = call_res->dreg;
-			typed_objref->klass = gcomparer_inst;
-			MONO_ADD_INS (cfg->cbb, typed_objref);
+				call_res = typed_objref;
 
-			call_res = typed_objref;
-
-			/* Force decompose */
-			cfg->flags |= MONO_CFG_NEEDS_DECOMPOSE;
-			cfg->cbb->needs_decompose = TRUE;
+				/* Force decompose */
+				cfg->flags |= MONO_CFG_NEEDS_DECOMPOSE;
+				cfg->cbb->needs_decompose = TRUE;
+			}
 		}
 	}