Ensure we decont into a fresh register.

In cases where we actually get a register that is persistent (such as holding a local that a lexical was lowered into), we should not go and ruin the variable.
Raku · Jul 6, 2014 · 0860fab · 0860fab
1 parent 32ddb22
commit 0860fab
Showing 1 changed file with 30 additions and 12 deletions.
diff --git a/src/vm/moar/QAST/QASTOperationsMAST.nqp b/src/vm/moar/QAST/QASTOperationsMAST.nqp
@@ -749,13 +749,22 @@ for <if unless> -> $op_name {
 
         # Emit the jump.
         if @comp_ops[0].result_kind == $MVM_reg_obj {
-            push_op(@ins, 'decont', @comp_ops[0].result_reg, @comp_ops[0].result_reg);
+            my $decont_reg := $*REGALLOC.fresh_register($MVM_reg_obj);
+            push_op(@ins, 'decont', $decont_reg, @comp_ops[0].result_reg);
+            push_op(@ins,
+                resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'if'),
+                $decont_reg,
+                ($operands == 3 ?? $else_lbl !! $end_lbl)
+            );
+            $*REGALLOC.release_register($decont_reg, $MVM_reg_obj);
+        }
+        else {
+            push_op(@ins,
+                resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'if'),
+                @comp_ops[0].result_reg,
+                ($operands == 3 ?? $else_lbl !! $end_lbl)
+            );
         }
-        push_op(@ins,
-            resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'if'),
-            @comp_ops[0].result_reg,
-            ($operands == 3 ?? $else_lbl !! $end_lbl)
-        );
 
         # Emit the then, stash the result
         push_ilist(@ins, @comp_ops[1]);
@@ -1030,13 +1039,22 @@ for ('', 'repeat_') -> $repness {
             push_ilist(@loop_il, @comp_ops[0]);
             push_op(@loop_il, 'set', $res_reg, @comp_ops[0].result_reg);
             if @comp_ops[0].result_kind == $MVM_reg_obj {
-                push_op(@loop_il, 'decont', @comp_ops[0].result_reg, @comp_ops[0].result_reg);
+                my $decont_reg := $*REGALLOC.fresh_register($MVM_reg_obj);
+                push_op(@loop_il, 'decont', $decont_reg, @comp_ops[0].result_reg);
+                push_op(@loop_il,
+                    resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'while'),
+                    $decont_reg,
+                    $done_lbl
+                );
+                $*REGALLOC.release_register($decont_reg, $MVM_reg_obj);
+            }
+            else {
+                push_op(@loop_il,
+                    resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'while'),
+                    @comp_ops[0].result_reg,
+                    $done_lbl
+                );
             }
-            push_op(@loop_il,
-                resolve_condition_op(@comp_ops[0].result_kind, $op_name eq 'while'),
-                @comp_ops[0].result_reg,
-                $done_lbl
-            );
 
             # Handle immediate blocks wanting the value as an arg.
             if $*IMM_ARG {