[Python-checkins] Revert "bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)" (GH-27194) (#27195)

[ambv]

https://github.com/python/cpython/commit/42a5514cca6b4542f6b492b5652e337f15a89227
commit: 42a5514cca6b4542f6b492b5652e337f15a89227
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-07-16T19:29:32+02:00
summary:

Revert "bpo-44645: Check for interrupts on any potentially backwards edge. (GH-27167)" (GH-27194) (#27195)

This reverts commit 000e70ad5246732fcbd27cf59268185cbd5ad734.
(cherry picked from commit c90c591e5158ab7b531dcd6e2a5f00bc70ba7637)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
M Lib/test/test_threading.py
M Python/ceval.c

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 3b5bc42357e58..f648a8b2bc52f 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1604,31 +1604,6 @@ def test_interrupt_main_invalid_signal(self):
         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 429ddb82bd66d..6482c8892d43f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3759,17 +3759,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();
@@ -3786,14 +3783,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)
                 ;