@@ -2575,46 +2575,46 @@ def _translate_fast_optional_eq_cmp(
25752575 value_typ = optional_value_type (lreg .type )
25762576 assert value_typ
25772577 res = Register (bool_rprimitive )
2578- x = self .add (ComparisonOp (lreg , self .none_object (), ComparisonOp .EQ , line ))
2578+ cmp = self .add (ComparisonOp (lreg , self .none_object (), ComparisonOp .EQ , line ))
25792579 l_none = BasicBlock ()
25802580 l_not_none = BasicBlock ()
25812581 out = BasicBlock ()
2582- self .add (Branch (x , l_none , l_not_none , Branch .BOOL ))
2582+ self .add (Branch (cmp , l_none , l_not_none , Branch .BOOL ))
25832583 self .activate_block (l_none )
25842584 if not isinstance (rreg .type , RUnion ):
25852585 self .add (Assign (res , self .false ()))
25862586 else :
25872587 op = ComparisonOp .EQ if expr_op == "==" else ComparisonOp .NEQ
2588- y = self .add (ComparisonOp (rreg , self .none_object (), op , line ))
2589- self .add (Assign (res , y ))
2588+ cmp = self .add (ComparisonOp (rreg , self .none_object (), op , line ))
2589+ self .add (Assign (res , cmp ))
25902590 self .goto (out )
25912591 self .activate_block (l_not_none )
25922592 if not isinstance (rreg .type , RUnion ):
2593- z = self .translate_eq_cmp (
2593+ eq = self .translate_eq_cmp (
25942594 self .unbox_or_cast (lreg , value_typ , line , can_borrow = True , unchecked = True ),
25952595 rreg ,
25962596 expr_op ,
25972597 line ,
25982598 )
2599- assert z is not None
2600- self .add (Assign (res , z ))
2599+ assert eq is not None
2600+ self .add (Assign (res , eq ))
26012601 else :
26022602 r_none = BasicBlock ()
26032603 r_not_none = BasicBlock ()
2604- x = self .add (ComparisonOp (rreg , self .none_object (), ComparisonOp .EQ , line ))
2605- self .add (Branch (x , r_none , r_not_none , Branch .BOOL ))
2604+ cmp = self .add (ComparisonOp (rreg , self .none_object (), ComparisonOp .EQ , line ))
2605+ self .add (Branch (cmp , r_none , r_not_none , Branch .BOOL ))
26062606 self .activate_block (r_none )
26072607 self .add (Assign (res , self .false ()))
26082608 self .goto (out )
26092609 self .activate_block (r_not_none )
2610- z = self .translate_eq_cmp (
2610+ eq = self .translate_eq_cmp (
26112611 self .unbox_or_cast (lreg , value_typ , line , can_borrow = True , unchecked = True ),
26122612 self .unbox_or_cast (rreg , value_typ , line , can_borrow = True , unchecked = True ),
26132613 expr_op ,
26142614 line ,
26152615 )
2616- assert z is not None
2617- self .add (Assign (res , z ))
2616+ assert eq is not None
2617+ self .add (Assign (res , eq ))
26182618 self .goto (out )
26192619 self .activate_block (out )
26202620 return res
0 commit comments