Ticket #185: python-gil-pruning-nodebug.patch

Source/Modules/python.cxx

@@ -1474 +1474 @@
     /* Last node in overloaded chain */
 
     int maxargs;
-    int allow_thread = threads_enable(n);
 
     String *tmp = NewString("");
     String *dispatch;
@@ -1497 +1496 @@
     Wrapper_add_local(f, "argc", "int argc");
     Printf(tmp, "PyObject *argv[%d]", maxargs + 1);
     Wrapper_add_local(f, "argv", tmp);
-    if (allow_thread)
-      thread_begin_block(n, f->code);
 
     if (!fastunpack) {
       Wrapper_add_local(f, "ii", "int ii");
@@ -1515 +1512 @@
 
     Replaceall(dispatch, "$args", "self,args");
 
-    if (allow_thread) {
-      String *ret = NewStringEmpty();
-      thread_end_block(n, ret);
-      Append(ret, "return ");
-      Replaceall(dispatch, "return ", ret);
-      Delete(ret);
-    }
-
     Printv(f->code, dispatch, "\n", NIL);
 
-    if (allow_thread)
-      thread_end_block(n, f->code);
-
     if (GetFlag(n, "feature:python:maybecall")) {
       Append(f->code, "fail:\n");
       Append(f->code, "Py_INCREF(Py_NotImplemented);\n");
@@ -1634 +1620 @@
     kwargs = NewString("");
 
     int allow_thread = threads_enable(n);
-    if (allow_thread)
-      thread_begin_block(n, f->code);
 
     Wrapper_add_local(f, "resultobj", "PyObject *resultobj = 0");
 
@@ -2066 +2050 @@
       }
     }
 
-    if (allow_thread)
-      thread_end_block(n, f->code);
     Append(f->code, "    return resultobj;\n");
 
     /* Error handling code */
@@ -2076 +2058 @@
     if (need_cleanup) {
       Printv(f->code, cleanup, NIL);
     }
-    if (allow_thread)
-      thread_end_block(n, f->code);
     Printv(f->code, ctab4, "return NULL;\n", NIL);
 
 
@@ -3562 +3542 @@
 
     int allow_thread = threads_enable(n);
 
-    if (allow_thread)
-      thread_begin_block(n, w->code);
-
     if (allow_thread) {
+      thread_begin_block(n, w->code);
       Append(w->code, "{\n");
     }