Switch back to original "assign task number at construction" but store the counter as PyLong for deferred formatting

Author: itamaro

Modules/_asynciomodule.c

@@ -2070,8 +2070,9 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,
 
     if (name == Py_None) {
         // optimization: defer task name formatting
-        // set task_name to None to indicate deferred formatting
-        Py_INCREF(name);
+        // store the task counter as PyLong in the name
+        // for deferred formatting in get_name
+        name = PyLong_FromUnsignedLongLong(++state->task_name_counter);
     } else if (!PyUnicode_CheckExact(name)) {
         name = PyObject_Str(name);
     } else {
@@ -2450,14 +2451,12 @@ _asyncio_Task_get_name_impl(TaskObj *self)
 /*[clinic end generated code: output=0ecf1570c3b37a8f input=a4a6595d12f4f0f8]*/
 {
     if (self->task_name) {
-        if (Py_IsNone(self->task_name)) {
-            asyncio_state *state = get_asyncio_state_by_def((PyObject *)self);
-            PyObject *name = PyUnicode_FromFormat(
-                "Task-%" PRIu64, ++state->task_name_counter);
-            Py_XSETREF(self->task_name, name);
-            if (self->task_name == NULL) {
+        if (PyLong_CheckExact(self->task_name)) {
+            PyObject *name = PyUnicode_FromFormat("Task-%S", self->task_name);
+            if (name == NULL) {
                 return NULL;
             }
+            Py_SETREF(self->task_name, name);
         }
         return Py_NewRef(self->task_name);
     }