remove complex result struct for try_store_instance_attr_status.

Author: LindaSummer

Objects/dictobject.c

@@ -7514,18 +7514,14 @@ typedef enum {
     TRY_STORE_ATTR_ALREADY_VALID = 2
 } try_store_instance_attr_status;
 
-typedef struct {
-    try_store_instance_attr_status try_status;
-    int res;
-} try_store_instance_attr_result_t;
-
-static try_store_instance_attr_result_t
+static try_store_instance_attr_status
 try_store_instance_attr_invalid_inline(PyObject *obj, PyObject *name,
-                                       PyObject *value)
+                                       PyObject *value, int *res)
 {
     bool valid;
     PyDictObject *dict;
     PyDictValues *values = _PyObject_InlineValues(obj);
+    *res = 0;
     Py_BEGIN_CRITICAL_SECTION(obj);
     if (!(valid = FT_ATOMIC_LOAD_UINT8(values->valid))) {
         dict = _PyObject_GetManagedDict(obj);
@@ -7536,35 +7532,32 @@ try_store_instance_attr_invalid_inline(PyObject *obj, PyObject *name,
     Py_END_CRITICAL_SECTION();
 
     if (valid) {
-        return (try_store_instance_attr_result_t){TRY_STORE_ATTR_ALREADY_VALID, 0};
+        return TRY_STORE_ATTR_ALREADY_VALID;
     }
 
     if (dict == NULL) {
         // PyObject_GenericGetDict may lock the object,
         // so we need to do it outside of the critical section.
         dict = (PyDictObject *)PyObject_GenericGetDict(obj, NULL);
         if (dict == NULL) {
-            return (try_store_instance_attr_result_t){TRY_STORE_ATTR_FAILURE, -1};
+            *res = -1;
+            return TRY_STORE_ATTR_FAILURE;
         }
     }
 
-    int res;
     bool success = false;
     Py_BEGIN_CRITICAL_SECTION2(obj, dict);
     PyDictObject *current_dict = _PyObject_GetManagedDict(obj);
     if (current_dict == dict && !(valid = FT_ATOMIC_LOAD_UINT8(values->valid))) {
         success = true;
-        res = store_instance_attr_with_dict_lock_held(obj, dict, name, value);
+        *res = store_instance_attr_with_dict_lock_held(obj, dict, name, value);
     }
     Py_END_CRITICAL_SECTION2();
     Py_DECREF(dict);
     if (success) {
-        return (try_store_instance_attr_result_t){TRY_STORE_ATTR_DONE, res};
+        return TRY_STORE_ATTR_DONE;
     }
-    if (valid) {
-        return (try_store_instance_attr_result_t){TRY_STORE_ATTR_ALREADY_VALID, 0};
-    }
-    return (try_store_instance_attr_result_t){TRY_STORE_ATTR_RETRY, 0};
+    return valid ? TRY_STORE_ATTR_ALREADY_VALID : TRY_STORE_ATTR_RETRY;
 }
 #endif
 
@@ -7574,18 +7567,19 @@ _PyObject_StoreInstanceAttribute(PyObject *obj, PyObject *name, PyObject *value)
     PyDictValues *values = _PyObject_InlineValues(obj);
 #ifdef Py_GIL_DISABLED
     uint8_t valid;
-    try_store_instance_attr_result_t try_res = {TRY_STORE_ATTR_ALREADY_VALID, 0};
+    int res;
+    try_store_instance_attr_status try_status = TRY_STORE_ATTR_ALREADY_VALID;
     while (!(valid = FT_ATOMIC_LOAD_UINT8(values->valid))) {
         // Retry if the managed dict changes before we can lock and validate it.
-        try_res = try_store_instance_attr_invalid_inline(obj, name, value);
-        if (try_res.try_status != TRY_STORE_ATTR_RETRY) {
+        try_status = try_store_instance_attr_invalid_inline(obj, name, value, &res);
+        if (try_status != TRY_STORE_ATTR_RETRY) {
             break;
         }
     }
-    switch (try_res.try_status) {
+    switch (try_status) {
         case TRY_STORE_ATTR_FAILURE:
         case TRY_STORE_ATTR_DONE:
-            return try_res.res;
+            return res;
         case TRY_STORE_ATTR_ALREADY_VALID:
             break;
         case TRY_STORE_ATTR_RETRY: