Skip to content

Commit 477c784

Browse files
committed
Fix merge artifacts
1 parent 9754820 commit 477c784

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

Python/flowgraph.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,6 @@ add_const(PyObject *newconst, PyObject *consts, PyObject *const_cache)
13481348
return (int)index;
13491349
}
13501350

1351-
ant_sequence(cfg_instr *inst, int n)
1352-
=======
13531351
/*
13541352
Walk basic block backwards starting from "start" trying to collect "size" number of
13551353
subsequent constants from instructions loading constants into new tuple ignoring NOP's in between.
@@ -1435,7 +1433,7 @@ fold_tuple_of_constants(basicblock *bb, int n, PyObject *consts, PyObject *const
14351433
int index = add_const(newconst, consts, const_cache);
14361434
RETURN_IF_ERROR(index);
14371435
nop_out(bb, n-1, seq_size);
1438-
INSTR_SET_OP1(&bb->b_instr[n], LOAD_CONST, index)
1436+
INSTR_SET_OP1(&bb->b_instr[n], LOAD_CONST, index);
14391437
return SUCCESS;
14401438
}
14411439

@@ -1950,12 +1948,6 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
19501948
RETURN_IF_ERROR(fold_tuple_of_constants(bb, i, consts, const_cache));
19511949
break;
19521950
case BUILD_LIST:
1953-
if (i >= oparg && !is_constant_sequence(inst-oparg, oparg)
1954-
&& (nextop == CONTAINS_OP || nextop == GET_ITER)) {
1955-
INSTR_SET_OP1(inst, BUILD_TUPLE, oparg);
1956-
break;
1957-
}
1958-
_Py_FALLTHROUGH;
19591951
case BUILD_SET:
19601952
RETURN_IF_ERROR(optimize_lists_and_sets(bb, i, nextop, consts, const_cache));
19611953
break;

0 commit comments

Comments
 (0)