Fix patma guard

youknowone · youknowone · commit 67bbe811dfc5 · 2025-08-26T15:34:12.000+09:00
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
@@ -586,7 +586,6 @@ def test_patma_051(self):
         self.assertEqual(y, 1)
         self.assertEqual(z, 0)
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_052(self):
         x = [1, 0]
         match x:
@@ -1904,7 +1903,6 @@ def whereis(points):
         self.assertEqual(whereis([Point(0, 0), Point(0, 0), Point(0, 0)]), "Something else")
         self.assertEqual(whereis([Point(0, 1), Point(0, 1), Point(0, 1)]), "Something else")
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_183(self):
         def whereis(point):
             match point:
@@ -2695,7 +2693,6 @@ def f(self, x):
         setattr(c, "__attr", "spam")  # setattr is needed because we're in a class scope
         self.assertEqual(Outer().f(c), "spam")
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_250(self):
         def f(x):
             match x:
@@ -2707,7 +2704,6 @@ def f(x):
         self.assertIs(f({"foo": 1}), True)
         self.assertIs(f({"foo": -1}), False)
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_251(self):
         def f(v, x):
             match v:
@@ -2726,7 +2722,6 @@ def __init__(self, attr):
         self.assertIs(f(-1, X(-1)), False)
         self.assertIs(f(1, X(-1)), None)
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_252(self):
         # Side effects must be possible in guards:
         effects = []
@@ -2764,7 +2759,6 @@ def f(v):
         self.assertEqual(f(1), 1)
         self.assertEqual(f({"x": 1}), 1)
 
-    @unittest.expectedFailure   # TODO: RUSTPYTHON
     def test_patma_255(self):
         x = []
         match x:
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -4011,10 +4011,10 @@ impl Compiler {
                 self.ensure_fail_pop(pattern_context, 0)?;
                 // Compile the guard expression
                 self.compile_expression(guard)?;
-                // If guard is false, jump to fail_pop[0]
+                emit!(self, Instruction::ToBool);
                 emit!(
                     self,
-                    Instruction::JumpIfFalseOrPop {
+                    Instruction::PopJumpIfFalse {
                         target: pattern_context.fail_pop[0]
                     }
                 );
