Revert "[llvm] Fix the allocation of vregs for the OP_MIN/MAX opcodes. Fixes #41947."
authorZoltan Varga <vargaz@gmail.com>
Sat, 18 Jun 2016 20:16:43 +0000 (16:16 -0400)
committerZoltan Varga <vargaz@gmail.com>
Sat, 18 Jun 2016 20:16:43 +0000 (16:16 -0400)
This reverts commit 4cbef26bb7878187c8bd3a0029e711331e6e4510.

Revert this to see if it fixes the windows build.

mono/mini/method-to-ir.c

index 3476585c10751c5d1e3f42fda8cb3990e1f7af3c..7df45ee2556f8ea504cc06ddbe7435fbaa49df3e 100644 (file)
@@ -5886,7 +5886,7 @@ llvm_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
                if (opcode && fsig->param_count == 1) {
                        MONO_INST_NEW (cfg, ins, opcode);
                        ins->type = STACK_R8;
-                       ins->dreg = mono_alloc_dreg (cfg, ins->type);
+                       ins->dreg = mono_alloc_freg (cfg);
                        ins->sreg1 = args [0]->dreg;
                        MONO_ADD_INS (cfg->cbb, ins);
                }
@@ -5917,7 +5917,7 @@ llvm_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
                if (opcode && fsig->param_count == 2) {
                        MONO_INST_NEW (cfg, ins, opcode);
                        ins->type = fsig->params [0]->type == MONO_TYPE_I4 ? STACK_I4 : STACK_I8;
-                       ins->dreg = mono_alloc_dreg (cfg, ins->type);
+                       ins->dreg = mono_alloc_ireg (cfg);
                        ins->sreg1 = args [0]->dreg;
                        ins->sreg2 = args [1]->dreg;
                        MONO_ADD_INS (cfg->cbb, ins);