From 416fc1431f7ce1f33388e3047d03cdc1cd35f72f Mon Sep 17 00:00:00 2001 From: EgorBo Date: Sat, 23 Nov 2019 00:49:49 +0300 Subject: [PATCH] Address feedback and fix C++ warnings Commit migrated from https://github.com/mono/mono/commit/1b7c7e60758af9bee4d1d6993b1472b117d225a6 --- src/mono/mono/mini/method-to-ir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c index 48192ae..6a51b81 100644 --- a/src/mono/mono/mini/method-to-ir.c +++ b/src/mono/mono/mini/method-to-ir.c @@ -8950,17 +8950,17 @@ calli_end: guchar* ldnull_ip; if ((ldnull_ip = il_read_op (next_ip, end, CEE_LDNULL, MONO_CEE_LDNULL)) && ip_in_bb (cfg, cfg->cbb, ldnull_ip)) { gboolean is_eq = FALSE, is_neq = FALSE; - if (ip = il_read_op (ldnull_ip, end, CEE_PREFIX1, MONO_CEE_CEQ)) + if ((ip = il_read_op (ldnull_ip, end, CEE_PREFIX1, MONO_CEE_CEQ))) is_eq = TRUE; - else if (ip = il_read_op (ldnull_ip, end, CEE_PREFIX1, MONO_CEE_CGT_UN)) + else if ((ip = il_read_op (ldnull_ip, end, CEE_PREFIX1, MONO_CEE_CGT_UN))) is_neq = TRUE; if ((is_eq || is_neq) && ip_in_bb (cfg, cfg->cbb, ip)) { next_ip = ip; - il_op = is_eq ? CEE_LDC_I4_0 : CEE_LDC_I4_1; + il_op = (MonoOpcodeEnum) (is_eq ? CEE_LDC_I4_0 : CEE_LDC_I4_1); EMIT_NEW_ICONST (cfg, ins, is_eq ? 0 : 1); ins->type = STACK_I4; - *sp++ = mono_decompose_opcode (cfg, ins); + *sp++ = ins; } break; } -- 2.7.4