[Python-checkins] Cleanup exit code for interpreter. (GH-17756)
Mark Shannon
webhook-mailer at python.org
Mon Jan 13 07:51:30 EST 2020
https://github.com/python/cpython/commit/e7c9f4aae1a8540fe8e9a8a5017b16f906f51068
commit: e7c9f4aae1a8540fe8e9a8a5017b16f906f51068
branch: master
author: Mark Shannon <mark at hotpy.org>
committer: GitHub <noreply at github.com>
date: 2020-01-13T12:51:26Z
summary:
Cleanup exit code for interpreter. (GH-17756)
files:
M Lib/test/test_code.py
M Python/ceval.c
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 656c46cfaa757..7bb824ea31dac 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -434,42 +434,6 @@ def run(self):
tt.join()
self.assertEqual(LAST_FREED, 500)
- @cpython_only
- def test_clean_stack_on_return(self):
-
- def f(x):
- return x
-
- code = f.__code__
- ct = type(f.__code__)
-
- # Insert an extra LOAD_FAST, this duplicates the value of
- # 'x' in the stack, leaking it if the frame is not properly
- # cleaned up upon exit.
-
- bytecode = list(code.co_code)
- bytecode.insert(-2, opcode.opmap['LOAD_FAST'])
- bytecode.insert(-2, 0)
-
- c = ct(code.co_argcount, code.co_posonlyargcount,
- code.co_kwonlyargcount, code.co_nlocals, code.co_stacksize+1,
- code.co_flags, bytes(bytecode),
- code.co_consts, code.co_names, code.co_varnames,
- code.co_filename, code.co_name, code.co_firstlineno,
- code.co_lnotab, code.co_freevars, code.co_cellvars)
- new_function = type(f)(c, f.__globals__, 'nf', f.__defaults__, f.__closure__)
-
- class Var:
- pass
- the_object = Var()
- var = weakref.ref(the_object)
-
- new_function(the_object)
-
- # Check if the_object is leaked
- del the_object
- assert var() is None
-
def test_main(verbose=None):
from test import test_code
diff --git a/Python/ceval.c b/Python/ceval.c
index 3bbd0ca9667b0..f780c212c5f23 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1913,7 +1913,8 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
case TARGET(RETURN_VALUE): {
retval = POP();
assert(f->f_iblock == 0);
- goto exit_returning;
+ assert(EMPTY());
+ goto exiting;
}
case TARGET(GET_AITER): {
@@ -2083,7 +2084,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
/* and repeat... */
assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT));
f->f_lasti -= sizeof(_Py_CODEUNIT);
- goto exit_yielding;
+ goto exiting;
}
case TARGET(YIELD_VALUE): {
@@ -2100,7 +2101,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
}
f->f_stacktop = stack_pointer;
- goto exit_yielding;
+ goto exiting;
}
case TARGET(POP_EXCEPT): {
@@ -3632,15 +3633,13 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
assert(retval == NULL);
assert(_PyErr_Occurred(tstate));
-exit_returning:
-
/* Pop remaining stack entries. */
while (!EMPTY()) {
PyObject *o = POP();
Py_XDECREF(o);
}
-exit_yielding:
+exiting:
if (tstate->use_tracing) {
if (tstate->c_tracefunc) {
if (call_trace_protected(tstate->c_tracefunc, tstate->c_traceobj,
More information about the Python-checkins
mailing list