@@ -713,8 +713,6 @@ dummy_func(
713713 // the following _POP_TOP_INT becomes _POP_TOP_NOP. Tier 2 only.
714714 tier2 op (_BINARY_OP_ADD_INT_INPLACE , (left , right -- res , l , r )) {
715715 INT_INPLACE_OP (left , right , left , + , _PyCompactLong_Add );
716- r = right ;
717- DEAD (right );
718716 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
719717 if (_int_inplace_ok ) {
720718 res = PyStackRef_DUP (left );
@@ -723,13 +721,12 @@ dummy_func(
723721 res = _int_inplace_res ;
724722 }
725723 l = left ;
726- DEAD (left );
724+ r = right ;
725+ INPUTS_DEAD ();
727726 }
728727
729728 tier2 op (_BINARY_OP_SUBTRACT_INT_INPLACE , (left , right -- res , l , r )) {
730729 INT_INPLACE_OP (left , right , left , - , _PyCompactLong_Subtract );
731- r = right ;
732- DEAD (right );
733730 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
734731 if (_int_inplace_ok ) {
735732 res = PyStackRef_DUP (left );
@@ -738,13 +735,12 @@ dummy_func(
738735 res = _int_inplace_res ;
739736 }
740737 l = left ;
741- DEAD (left );
738+ r = right ;
739+ INPUTS_DEAD ();
742740 }
743741
744742 tier2 op (_BINARY_OP_MULTIPLY_INT_INPLACE , (left , right -- res , l , r )) {
745743 INT_INPLACE_OP (left , right , left , * , _PyCompactLong_Multiply );
746- r = right ;
747- DEAD (right );
748744 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
749745 if (_int_inplace_ok ) {
750746 res = PyStackRef_DUP (left );
@@ -753,52 +749,50 @@ dummy_func(
753749 res = _int_inplace_res ;
754750 }
755751 l = left ;
756- DEAD (left );
752+ r = right ;
753+ INPUTS_DEAD ();
757754 }
758755
759756 tier2 op (_BINARY_OP_ADD_INT_INPLACE_RIGHT , (left , right -- res , l , r )) {
760757 INT_INPLACE_OP (left , right , right , + , _PyCompactLong_Add );
761- l = left ;
762- DEAD (left );
763758 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
764759 if (_int_inplace_ok ) {
765760 res = PyStackRef_DUP (right );
766761 }
767762 else {
768763 res = _int_inplace_res ;
769764 }
765+ l = left ;
770766 r = right ;
771- DEAD ( right );
767+ INPUTS_DEAD ( );
772768 }
773769
774770 tier2 op (_BINARY_OP_SUBTRACT_INT_INPLACE_RIGHT , (left , right -- res , l , r )) {
775771 INT_INPLACE_OP (left , right , right , - , _PyCompactLong_Subtract );
776- l = left ;
777- DEAD (left );
778772 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
779773 if (_int_inplace_ok ) {
780774 res = PyStackRef_DUP (right );
781775 }
782776 else {
783777 res = _int_inplace_res ;
784778 }
779+ l = left ;
785780 r = right ;
786- DEAD ( right );
781+ INPUTS_DEAD ( );
787782 }
788783
789784 tier2 op (_BINARY_OP_MULTIPLY_INT_INPLACE_RIGHT , (left , right -- res , l , r )) {
790785 INT_INPLACE_OP (left , right , right , * , _PyCompactLong_Multiply );
791- l = left ;
792- DEAD (left );
793786 EXIT_IF (!_int_inplace_ok && PyStackRef_IsNull (_int_inplace_res ));
794787 if (_int_inplace_ok ) {
795788 res = PyStackRef_DUP (right );
796789 }
797790 else {
798791 res = _int_inplace_res ;
799792 }
793+ l = left ;
800794 r = right ;
801- DEAD ( right );
795+ INPUTS_DEAD ( );
802796 }
803797
804798 op (_GUARD_NOS_FLOAT , (left , unused -- left , unused )) {
0 commit comments