Replace invariant test with assert in function watchers dispatch

itamaro · itamaro · commit 40044c09b4cd · 2022-12-05T11:35:21.000-08:00
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -18,7 +18,9 @@ notify_func_watchers(PyInterpreterState *interp, PyFunction_WatchEvent event,
         assert(i < FUNC_MAX_WATCHERS);
         if (bits & 1) {
             PyFunction_WatchCallback cb = interp->func_watchers[i];
-            if ((cb != NULL) && (cb(event, func, new_value) < 0)) {
+            // callback must be non-null if the watcher bit is set
+            assert(cb != NULL);
+            if (cb(event, func, new_value) < 0) {
                 PyErr_WriteUnraisable((PyObject *) func);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ notify_func_watchers(PyInterpreterState *interp, PyFunction_WatchEvent event,`
`18`	`18`	`assert(i < FUNC_MAX_WATCHERS);`
`19`	`19`	`if (bits & 1) {`
`20`	`20`	`PyFunction_WatchCallback cb = interp->func_watchers[i];`
`21`		`- if ((cb != NULL) && (cb(event, func, new_value) < 0)) {`
	`21`	`+ // callback must be non-null if the watcher bit is set`
	`22`	`+ assert(cb != NULL);`
	`23`	`+ if (cb(event, func, new_value) < 0) {`
`22`	`24`	`PyErr_WriteUnraisable((PyObject *) func);`
`23`	`25`	`}`
`24`	`26`	`}`