Address code review

corona10 · corona10 · commit f30b355474b1 · 2024-12-24T00:54:20.000+09:00
diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h
@@ -108,7 +108,7 @@ typedef struct {
         3: Interned, Immortal, and Static
     This categorization allows the runtime to determine the right
     cleanup mechanism at runtime shutdown. */
-    uint16_t interned;
+    uint8_t interned;
     struct {
         /* Character size:
 
@@ -132,21 +132,21 @@ typedef struct {
              * all characters are in the range U+0000-U+10FFFF
              * at least one character is in the range U+10000-U+10FFFF
          */
-        uint16_t kind:3;
+        unsigned int kind:3;
         /* Compact is with respect to the allocation scheme. Compact unicode
            objects only require one memory block while non-compact objects use
            one block for the PyUnicodeObject struct and another for its data
            buffer. */
-        uint16_t compact:1;
+        unsigned int compact:1;
         /* The string only contains characters in the range U+0000-U+007F (ASCII)
            and the kind is PyUnicode_1BYTE_KIND. If ascii is set and compact is
            set, use the PyASCIIObject structure. */
-        uint16_t ascii:1;
+        unsigned int ascii:1;
         /* The object is statically allocated. */
-        uint16_t statically_allocated:1;
+        unsigned int statically_allocated:1;
         /* Padding to ensure that PyUnicode_DATA() is always aligned to
            4 bytes (see issue #19537 on m68k). */
-        uint16_t :10;
+        unsigned int :10;
     } state;
 } PyASCIIObject;
 
@@ -196,7 +196,7 @@ typedef struct {
 /* Use only if you know it's a string */
 static inline unsigned int PyUnicode_CHECK_INTERNED(PyObject *op) {
 #ifdef Py_GIL_DISABLED
-    return _Py_atomic_load_uint16_relaxed(&(_PyASCIIObject_CAST(op)->interned));
+    return _Py_atomic_load_uint8_relaxed(&(_PyASCIIObject_CAST(op)->interned));
 #else
     return _PyASCIIObject_CAST(op)->interned;
 #endif
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -15726,7 +15726,7 @@ immortalize_interned(PyObject *s)
         _Py_DecRefTotal(_PyThreadState_GET());
     }
 #endif
-    FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_IMMORTAL);
+    FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_IMMORTAL);
     _Py_SetImmortal(s);
 }
 
@@ -15845,7 +15845,7 @@ intern_common(PyInterpreterState *interp, PyObject *s /* stolen */,
         _Py_DecRefTotal(_PyThreadState_GET());
 #endif
     }
-    FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_MORTAL);
+    FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_MORTAL);
 
     /* INTERNED_MORTAL -> INTERNED_IMMORTAL (if needed) */
 
@@ -15981,7 +15981,7 @@ _PyUnicode_ClearInterned(PyInterpreterState *interp)
             Py_UNREACHABLE();
         }
         if (!shared) {
-            FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_NOT_INTERNED);
+            FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_NOT_INTERNED);
         }
     }
 #ifdef INTERNED_STATS

Original file line number	Diff line number	Diff line change
`@@ -15726,7 +15726,7 @@ immortalize_interned(PyObject *s)`
`15726`	`15726`	`_Py_DecRefTotal(_PyThreadState_GET());`
`15727`	`15727`	`}`
`15728`	`15728`	`#endif`
`15729`		`- FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_IMMORTAL);`
	`15729`	`+ FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_IMMORTAL);`
`15730`	`15730`	`_Py_SetImmortal(s);`
`15731`	`15731`	`}`
`15732`	`15732`
`@@ -15845,7 +15845,7 @@ intern_common(PyInterpreterState interp, PyObject s /* stolen */,`
`15845`	`15845`	`_Py_DecRefTotal(_PyThreadState_GET());`
`15846`	`15846`	`#endif`
`15847`	`15847`	`}`
`15848`		`- FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_MORTAL);`
	`15848`	`+ FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_INTERNED_MORTAL);`
`15849`	`15849`
`15850`	`15850`	`/* INTERNED_MORTAL -> INTERNED_IMMORTAL (if needed) */`
`15851`	`15851`
`@@ -15981,7 +15981,7 @@ _PyUnicode_ClearInterned(PyInterpreterState *interp)`
`15981`	`15981`	`Py_UNREACHABLE();`
`15982`	`15982`	`}`
`15983`	`15983`	`if (!shared) {`
`15984`		`- FT_ATOMIC_STORE_UINT16_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_NOT_INTERNED);`
	`15984`	`+ FT_ATOMIC_STORE_UINT8_RELAXED(_PyASCIIObject_CAST(s)->interned, SSTATE_NOT_INTERNED);`
`15985`	`15985`	`}`
`15986`	`15986`	`}`
`15987`	`15987`	`#ifdef INTERNED_STATS`