Over-engineer the watcher bits check

carljm · carljm · commit 6e5cee2a9ef5 · 2022-10-04T10:12:26.000-07:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -5765,11 +5765,12 @@ _PyDict_SendEvent(int watcher_bits,
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
     for (int i = 0; i < DICT_MAX_WATCHERS; i++) {
-        if (watcher_bits & (1 << i)) {
+        if (watcher_bits & 1) {
             PyDict_WatchCallback cb = (PyDict_WatchCallback)interp->dict_watchers[i];
             if (cb) {
                 cb(event, (PyObject*)mp, key, value);
             }
         }
+        watcher_bits >>= 1;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5765,11 +5765,12 @@ _PyDict_SendEvent(int watcher_bits,`
`5765`	`5765`	`{`
`5766`	`5766`	`PyInterpreterState *interp = _PyInterpreterState_GET();`
`5767`	`5767`	`for (int i = 0; i < DICT_MAX_WATCHERS; i++) {`
`5768`		`- if (watcher_bits & (1 << i)) {`
	`5768`	`+ if (watcher_bits & 1) {`
`5769`	`5769`	`PyDict_WatchCallback cb = (PyDict_WatchCallback)interp->dict_watchers[i];`
`5770`	`5770`	`if (cb) {`
`5771`	`5771`	`cb(event, (PyObject*)mp, key, value);`
`5772`	`5772`	`}`
`5773`	`5773`	`}`
	`5774`	`+ watcher_bits >>= 1;`
`5774`	`5775`	`}`
`5775`	`5776`	`}`