Merge branch 'gh-119333-notify' into HEAD

rhansen · rhansen · commit fcfab59905d0 · 2024-10-10T04:42:32.000-04:00
diff --git a/Python/context.c b/Python/context.c
@@ -113,7 +113,7 @@ context_event_name(PyContextEvent event) {
 }
 
 static void
-notify_context_watchers(PyContextEvent event, PyObject *ctx, PyThreadState *ts)
+notify_context_watchers(PyThreadState *ts, PyContextEvent event, PyObject *ctx)
 {
     assert(Py_REFCNT(ctx) > 0);
     PyInterpreterState *interp = ts->interp;
@@ -196,7 +196,7 @@ _PyContext_Enter(PyThreadState *ts, PyObject *octx)
     ts->context = Py_NewRef(ctx);
     ts->context_ver++;
 
-    notify_context_watchers(Py_CONTEXT_EVENT_ENTER, octx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_ENTER, octx);
     return 0;
 }
 
@@ -230,7 +230,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
         return -1;
     }
 
-    notify_context_watchers(Py_CONTEXT_EVENT_EXIT, octx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_EXIT, octx);
     Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);
     ts->context_ver++;
 

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ context_event_name(PyContextEvent event) {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`static void`
`116`		`-notify_context_watchers(PyContextEvent event, PyObject ctx, PyThreadState ts)`
	`116`	`+notify_context_watchers(PyThreadState ts, PyContextEvent event, PyObject ctx)`
`117`	`117`	`{`
`118`	`118`	`assert(Py_REFCNT(ctx) > 0);`
`119`	`119`	`PyInterpreterState *interp = ts->interp;`
`@@ -196,7 +196,7 @@ _PyContext_Enter(PyThreadState ts, PyObject octx)`
`196`	`196`	`ts->context = Py_NewRef(ctx);`
`197`	`197`	`ts->context_ver++;`
`198`	`198`
`199`		`- notify_context_watchers(Py_CONTEXT_EVENT_ENTER, octx, ts);`
	`199`	`+ notify_context_watchers(ts, Py_CONTEXT_EVENT_ENTER, octx);`
`200`	`200`	`return 0;`
`201`	`201`	`}`
`202`	`202`
`@@ -230,7 +230,7 @@ _PyContext_Exit(PyThreadState ts, PyObject octx)`
`230`	`230`	`return -1;`
`231`	`231`	`}`
`232`	`232`
`233`		`- notify_context_watchers(Py_CONTEXT_EVENT_EXIT, octx, ts);`
	`233`	`+ notify_context_watchers(ts, Py_CONTEXT_EVENT_EXIT, octx);`
`234`	`234`	`Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);`
`235`	`235`	`ts->context_ver++;`
`236`	`236`