Revert "GH-128563: Simplify recursion check in `_PyEval_EvalFrameDefa… · mpage/cpython@3edc57c · GitHub

mpage / cpython Public

forked from python/cpython

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 1

• Code
• Pull requests 1
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 3edc57c

Browse filesBrowse the repository at this point in the historyBrowse files

mpage

committed

Revert "pythonGH-128563: Simplify recursion check in _PyEval_EvalFrameDefault (pythonGH-129481)"

This reverts commit c3ae5c9.

1 parent cf4c4ec commit 3edc57c
Copy full SHA for 3edc57c

1 file changed

+6-5Lines changed: 6 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Python
  • ceval.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Python/ceval.c‎

Copy file name to clipboardExpand all lines: Python/ceval.c

+6-5Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -786,11 +786,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
786	786
787	787	_PyInterpreterFrame entry_frame;
788	788
789		- if (_Py_EnterRecursiveCallTstate(tstate, "")) {
790		- assert(frame->owner != FRAME_OWNED_BY_INTERPRETER);
791		- _PyEval_FrameClearAndPop(tstate, frame);
792		- return NULL;
793		- }
	789	+
794	790
795	791	/* Local "register" variables.
796	792	* These are cached values from the frame and code object. */
@@ -820,6 +816,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
820	816	tstate->current_frame = frame;
821	817
822	818	tstate->c_recursion_remaining -= (PY_EVAL_C_STACK_UNITS - 1);
	819	+ if (_Py_EnterRecursiveCallTstate(tstate, "")) {
	820	+ tstate->c_recursion_remaining--;
	821	+ tstate->py_recursion_remaining--;
	822	+ goto exit_unwind;
	823	+ }
823	824
824	825	/* support for generator.throw() */
825	826	if (throwflag) {

0 commit comments

Comments

0 (0)