Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Revert "Fix depth-first-search computation in compile.c (GH-16042)" (GH-16050) 

This reverts commit 355f3e1e5c.

bpo-38135
This commit is contained in:
T. Wouters 2019-09-12 07:05:33 -07:00 committed by Gregory P. Smith
parent 355f3e1e5c
commit 99b54d6817
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Python/compile.c
View File

@ -5373,7 +5373,7 @@ compiler_visit_slice(struct compiler *c, slice_ty s, expr_context_ty ctx)
/* End of the compiler section, beginning of the assembler section */ /* End of the compiler section, beginning of the assembler section */
/* do depth-first search of basic block graph, starting with block. /* do depth-first search of basic block graph, starting with block.
a_order records the block indices in order. post records the block indices in post-order.
XXX must handle implicit jumps from one block to next XXX must handle implicit jumps from one block to next
*/ */
@ -5382,7 +5382,7 @@ struct assembler {
PyObject *a_bytecode; /* string containing bytecode */ PyObject *a_bytecode; /* string containing bytecode */
int a_offset; /* offset into bytecode */ int a_offset; /* offset into bytecode */
int a_nblocks; /* number of reachable blocks */ int a_nblocks; /* number of reachable blocks */
basicblock **a_order; /* list of blocks in dfs order */ basicblock **a_postorder; /* list of blocks in dfs postorder */
PyObject *a_lnotab; /* string containing lnotab */ PyObject *a_lnotab; /* string containing lnotab */
int a_lnotab_off; /* offset into lnotab */ int a_lnotab_off; /* offset into lnotab */
int a_lineno; /* last lineno of emitted instruction */ int a_lineno; /* last lineno of emitted instruction */
@ -5390,21 +5390,28 @@ struct assembler {
}; };
static void static void
dfs(struct compiler *c, basicblock *entry, struct assembler *a) dfs(struct compiler *c, basicblock *b, struct assembler *a, int end)
{ {
/* Avoid excessive recursion by following 'next' links to the int i, j;
* end of the chain before handling any branches */
for (basicblock *b = entry; b; b = b->b_next) { /* Get rid of recursion for normal control flow.
Since the number of blocks is limited, unused space in a_postorder
(from a_nblocks to end) can be used as a stack for still not ordered
blocks. */
for (j = end; b && !b->b_seen; b = b->b_next) {
b->b_seen = 1; b->b_seen = 1;
a->a_order[a->a_nblocks++] = b; assert(a->a_nblocks < j);
a->a_postorder[--j] = b;
} }
for (basicblock *b = entry; b; b = b->b_next) { while (j < end) {
for (int i = 0; i < b->b_iused; i++) { b = a->a_postorder[j++];
basicblock *target = b->b_instr[i].i_target; for (i = 0; i < b->b_iused; i++) {
if (target && !target->b_seen) { struct instr *instr = &b->b_instr[i];
dfs(c, target, a); if (instr->i_jrel || instr->i_jabs)
} dfs(c, instr->i_target, a, j);
} }
assert(a->a_nblocks < j);
a->a_postorder[a->a_nblocks++] = b;
} }
} }
@ -5510,9 +5517,9 @@ assemble_init(struct assembler *a, int nblocks, int firstlineno)
PyErr_NoMemory(); PyErr_NoMemory();
return 0; return 0;
} }
a->a_order = (basicblock **)PyObject_Malloc( a->a_postorder = (basicblock **)PyObject_Malloc(
sizeof(basicblock *) * nblocks); sizeof(basicblock *) * nblocks);
if (!a->a_order) { if (!a->a_postorder) {
PyErr_NoMemory(); PyErr_NoMemory();
return 0; return 0;
} }
@ -5524,8 +5531,8 @@ assemble_free(struct assembler *a)
{ {
Py_XDECREF(a->a_bytecode); Py_XDECREF(a->a_bytecode);
Py_XDECREF(a->a_lnotab); Py_XDECREF(a->a_lnotab);
if (a->a_order) if (a->a_postorder)
PyObject_Free(a->a_order); PyObject_Free(a->a_postorder);
} }
static int static int
@ -5686,8 +5693,8 @@ assemble_jump_offsets(struct assembler *a, struct compiler *c)
Replace block pointer with position in bytecode. */ Replace block pointer with position in bytecode. */
do { do {
totsize = 0; totsize = 0;
for (i = 0; i < a->a_nblocks; i++) { for (i = a->a_nblocks - 1; i >= 0; i--) {
b = a->a_order[i]; b = a->a_postorder[i];
bsize = blocksize(b); bsize = blocksize(b);
b->b_offset = totsize; b->b_offset = totsize;
totsize += bsize; totsize += bsize;
@ -5991,15 +5998,14 @@ assemble(struct compiler *c, int addNone)
} }
if (!assemble_init(&a, nblocks, c->u->u_firstlineno)) if (!assemble_init(&a, nblocks, c->u->u_firstlineno))
goto error; goto error;
dfs(c, entryblock, &a); dfs(c, entryblock, &a, nblocks);
assert(a.a_nblocks <= nblocks);
/* Can't modify the bytecode after computing jump offsets. */ /* Can't modify the bytecode after computing jump offsets. */
assemble_jump_offsets(&a, c); assemble_jump_offsets(&a, c);
/* Emit code in order from dfs. */ /* Emit code in reverse postorder from dfs. */
for (i = 0; i < a.a_nblocks; i++) { for (i = a.a_nblocks - 1; i >= 0; i--) {
b = a.a_order[i]; b = a.a_postorder[i];
for (j = 0; j < b->b_iused; j++) for (j = 0; j < b->b_iused; j++)
if (!assemble_emit(&a, &b->b_instr[j])) if (!assemble_emit(&a, &b->b_instr[j]))
goto error; goto error;