From: Pablo Galindo Salgado Date: Fri, 16 Jul 2021 17:05:47 +0000 (+0100) Subject: Revert "bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167... X-Git-Tag: v3.11.0a1~650 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c90c591e5158ab7b531dcd6e2a5f00bc70ba7637;p=thirdparty%2FPython%2Fcpython.git Revert "bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)" (#27194) This reverts commit 000e70ad5246732fcbd27cf59268185cbd5ad734. --- diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 3b5bc42357e5..f648a8b2bc52 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -1604,31 +1604,6 @@ class InterruptMainTests(unittest.TestCase): self.assertRaises(ValueError, _thread.interrupt_main, signal.NSIG) self.assertRaises(ValueError, _thread.interrupt_main, 1000000) - @threading_helper.reap_threads - def test_can_interrupt_tight_loops(self): - cont = True - started = False - iterations = 100_000_000 - - def worker(): - nonlocal iterations - nonlocal started - started = True - while cont: - if iterations: - iterations -= 1 - else: - return - pass - - t = threading.Thread(target=worker) - t.start() - while not started: - pass - cont = False - t.join() - self.assertNotEqual(iterations, 0) - class AtexitTests(unittest.TestCase): diff --git a/Python/ceval.c b/Python/ceval.c index 90112aa3f947..a6eb83a4909d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3638,17 +3638,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag) if (Py_IsFalse(cond)) { Py_DECREF(cond); JUMPTO(oparg); - CHECK_EVAL_BREAKER(); DISPATCH(); } err = PyObject_IsTrue(cond); Py_DECREF(cond); if (err > 0) ; - else if (err == 0) { + else if (err == 0) JUMPTO(oparg); - CHECK_EVAL_BREAKER(); - } else goto error; DISPATCH(); @@ -3665,14 +3662,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag) if (Py_IsTrue(cond)) { Py_DECREF(cond); JUMPTO(oparg); - CHECK_EVAL_BREAKER(); DISPATCH(); } err = PyObject_IsTrue(cond); Py_DECREF(cond); if (err > 0) { JUMPTO(oparg); - CHECK_EVAL_BREAKER(); } else if (err == 0) ;