[llvm] Fix the handling of moves in the LICM optimization.

diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c
index de70440903ed1268787b5d795ff67177614c59ad..98805ba533e244567f271daaeb69871dbd3fce6f 100644 (file)
--- a/mono/mini/ssa.c
+++ b/mono/mini/ssa.c
@@ -1425,18 +1425,21 @@ mono_ssa_loop_invariant_code_motion (MonoCompile *cfg)
                                        sreg = -1;
                                if (sreg != -1) {
                                        skip = FALSE;
-                                       MONO_BB_FOR_EACH_INS (bb, tins) {
+                                       MonoInst *tins;
+
+                                       for (tins = ins->prev; tins; tins = tins->prev) {
                                                const char *spec = INS_INFO (tins->opcode);
 
                                                if (tins->opcode == OP_MOVE && tins->dreg == sreg) {
                                                        sreg = tins->sreg1;
-                                               } else if (spec [MONO_INST_DEST] != ' ' && tins->dreg == ins->sreg1) {
+                                               } if (spec [MONO_INST_DEST] != ' ' && tins->dreg == sreg) {
                                                        skip = TRUE;
                                                        break;
                                                }
                                        }
                                        if (skip)
                                                continue;
+                                       ins->sreg1 = sreg;
                                }
 
                                if (cfg->verbose_level > 1) {