Commit48b7d75

authored

[3.14]gh-140936: Fix JIT assertion crash at finalization if some generator is alive (GH-140969) (GH-141494)

gh-140936: Fix JIT assertion crash at finalization if some generator is alive (GH-140969)

1 parent425e423 commit48b7d75Copy full SHA for 48b7d75

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1972,6 +1972,26 @@ def testfunc(n):`
`1972`	`1972`	`assert ex is not None`
`1973`	`1973`	`"""))`
`1974`	`1974`
	`1975`	`+deftest_interpreter_finalization_with_generator_alive(self):`
	`1976`	`+script_helper.assert_python_ok("-c",textwrap.dedent("""`
	`1977`	`+ import sys`
	`1978`	`+ t = tuple(range(%d))`
	`1979`	`+ def simple_for():`
	`1980`	`+ for x in t:`
	`1981`	`+ x`
	`1982`	`+`
	`1983`	`+ def gen():`
	`1984`	`+ try:`
	`1985`	`+ yield`
	`1986`	`+ except:`
	`1987`	`+ simple_for()`
	`1988`	`+`
	`1989`	`+ sys.settrace(lambda *args: None)`
	`1990`	`+ simple_for()`
	`1991`	`+ g = gen()`
	`1992`	`+ next(g)`
	`1993`	`+ """%_testinternalcapi.SPECIALIZATION_THRESHOLD))`
	`1994`	`+`
`1975`	`1995`
`1976`	`1996`	`defglobal_identity(x):`
`1977`	`1997`	`returnx`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,14 @@ _PyOptimizer_Optimize(`
`116`	`116`	`_PyExecutorObject**executor_ptr,intchain_depth)`
`117`	`117`	`{`
`118`	`118`	`_PyStackRef*stack_pointer=frame->stackpointer;`
`119`		`-assert(_PyInterpreterState_GET()->jit);`
	`119`	`+PyInterpreterState*interp=_PyInterpreterState_GET();`
	`120`	`+if (!interp->jit) {`
	`121`	`+// gh-140936: It is possible that interp->jit will become false during`
	`122`	`+// interpreter finalization. However, the specialized JUMP_BACKWARD_JIT`
	`123`	`+// instruction may still be present. In this case, we should`
	`124`	`+// return immediately without optimization.`
	`125`	`+return0;`
	`126`	`+ }`
`120`	`127`	`// The first executor in a chain and the MAX_CHAIN_DEPTH'th executor must`
`121`	`128`	`// make progress in order to avoid infinite loops or excessively-long`
`122`	`129`	`// side-exit chains. We can only insert the executor into the bytecode if`

Comments

(0)