@@ -1471,12 +1471,11 @@ fold_constant_intrinsic_list_to_tuple(basicblock *bb, int i,
1471
1471
{
1472
1472
assert (PyDict_CheckExact (const_cache ));
1473
1473
assert (PyList_CheckExact (consts ));
1474
- assert (i >= 0 && i < bb -> b_iused );
1474
+ assert (i >= 0 );
1475
+ assert (i < bb -> b_iused );
1475
1476
cfg_instr * intrinsic = & bb -> b_instr [i ];
1476
- assert (
1477
- intrinsic -> i_opcode == CALL_INTRINSIC_1 &&
1478
- intrinsic -> i_oparg == INTRINSIC_LIST_TO_TUPLE
1479
- );
1477
+ assert (intrinsic -> i_opcode == CALL_INTRINSIC_1 );
1478
+ assert (intrinsic -> i_oparg == INTRINSIC_LIST_TO_TUPLE );
1480
1479
1481
1480
PyObject * list = PyList_New (0 );
1482
1481
if (list == NULL ) {
@@ -2384,11 +2383,12 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
2384
2383
RETURN_IF_ERROR (fold_const_unaryop (bb , i , consts , const_cache ));
2385
2384
break ;
2386
2385
case CALL_INTRINSIC_1 :
2387
- // for _ in (*foo, *bar) -> for _ in [*foo, *bar]
2388
2386
if (oparg == INTRINSIC_LIST_TO_TUPLE ) {
2387
+ // for _ in (*foo, *bar) -> for _ in [*foo, *bar]
2389
2388
if (nextop == GET_ITER ) {
2390
2389
INSTR_SET_OP0 (inst , NOP );
2391
- } else {
2390
+ }
2391
+ else {
2392
2392
fold_constant_intrinsic_list_to_tuple (bb , i , consts , const_cache );
2393
2393
}
2394
2394
}
0 commit comments