New Instruction ToBool,PopJumpIfFalse (RustPython#6112)

* New Instruction ToBool

* Rename JustIf{True,False} => PopJumpIf{...}

Author: youknowone

compiler/codegen/src/compile.rs

@@ -2027,7 +2027,7 @@ impl Compiler {
                 // We cannot handle this exception type:
                 emit!(
                     self,
-                    Instruction::JumpIfFalse {
+                    Instruction::PopJumpIfFalse {
                         target: next_handler,
                     }
                 );
@@ -3117,7 +3117,7 @@ impl Compiler {
             JumpOp::PopJumpIfFalse => {
                 emit!(
                     self,
-                    Instruction::JumpIfFalse {
+                    Instruction::PopJumpIfFalse {
                         target: pc.fail_pop[pops]
                     }
                 );
@@ -4398,14 +4398,14 @@ impl Compiler {
                 if condition {
                     emit!(
                         self,
-                        Instruction::JumpIfTrue {
+                        Instruction::PopJumpIfTrue {
                             target: target_block,
                         }
                     );
                 } else {
                     emit!(
                         self,
-                        Instruction::JumpIfFalse {
+                        Instruction::PopJumpIfFalse {
                             target: target_block,
                         }
                     );

compiler/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap

@@ -525,7 +525,7 @@ pub enum Instruction {
     Swap {
         index: Arg<u32>,
     },
-    // ToBool,
+    ToBool,
     Rotate2,
     Rotate3,
     Duplicate,
@@ -548,11 +548,11 @@ pub enum Instruction {
         target: Arg<Label>,
     },
     /// Pop the top of the stack, and jump if this value is true.
-    JumpIfTrue {
+    PopJumpIfTrue {
         target: Arg<Label>,
     },
     /// Pop the top of the stack, and jump if this value is false.
-    JumpIfFalse {
+    PopJumpIfFalse {
         target: Arg<Label>,
     },
     /// Peek at the top of the stack, and jump if this value is true.
@@ -1255,8 +1255,8 @@ impl Instruction {
     pub const fn label_arg(&self) -> Option<Arg<Label>> {
         match self {
             Jump { target: l }
-            | JumpIfTrue { target: l }
-            | JumpIfFalse { target: l }
+            | PopJumpIfTrue { target: l }
+            | PopJumpIfFalse { target: l }
             | JumpIfTrueOrPop { target: l }
             | JumpIfFalseOrPop { target: l }
             | ForIter { target: l }
@@ -1330,7 +1330,7 @@ impl Instruction {
             CopyItem { .. } => 1,
             Pop => -1,
             Swap { .. } => 0,
-            // ToBool => 0,
+            ToBool => 0,
             Rotate2 | Rotate3 => 0,
             Duplicate => 1,
             Duplicate2 => 2,
@@ -1341,7 +1341,7 @@ impl Instruction {
             Continue { .. } => 0,
             Break { .. } => 0,
             Jump { .. } => 0,
-            JumpIfTrue { .. } | JumpIfFalse { .. } => -1,
+            PopJumpIfTrue { .. } | PopJumpIfFalse { .. } => -1,
             JumpIfTrueOrPop { .. } | JumpIfFalseOrPop { .. } => {
                 if jump {
                     0
@@ -1533,7 +1533,7 @@ impl Instruction {
             CopyItem { index } => w!(CopyItem, index),
             Pop => w!(Pop),
             Swap { index } => w!(Swap, index),
-            // ToBool => w!(ToBool),
+            ToBool => w!(ToBool),
             Rotate2 => w!(Rotate2),
             Rotate3 => w!(Rotate3),
             Duplicate => w!(Duplicate),
@@ -1546,8 +1546,8 @@ impl Instruction {
             Continue { target } => w!(Continue, target),
             Break { target } => w!(Break, target),
             Jump { target } => w!(Jump, target),
-            JumpIfTrue { target } => w!(JumpIfTrue, target),
-            JumpIfFalse { target } => w!(JumpIfFalse, target),
+            PopJumpIfTrue { target } => w!(PopJumpIfTrue, target),
+            PopJumpIfFalse { target } => w!(PopJumpIfFalse, target),
             JumpIfTrueOrPop { target } => w!(JumpIfTrueOrPop, target),
             JumpIfFalseOrPop { target } => w!(JumpIfFalseOrPop, target),
             MakeFunction => w!(MakeFunction),