Make the structs PyUnstable

Author: encukou

Include/cpython/unicodeobject.h

@@ -160,43 +160,46 @@ typedef struct {
         unsigned int :24;
 #endif
     } state;
-} _PyASCIIObject;
+} PyUnstable_ASCIIObject;
 
 /* Non-ASCII strings allocated through PyUnicode_New use the
    PyCompactUnicodeObject structure. state.compact is set, and the data
    immediately follow the structure. */
 typedef struct {
-    _PyASCIIObject _base;
+    PyUnstable_ASCIIObject _base;
     Py_ssize_t utf8_length;     /* Number of bytes in utf8, excluding the
                                  * terminating \0. */
     char *utf8;                 /* UTF-8 representation (null-terminated) */
-} _PyCompactUnicodeObject;
+} PyUnstable_CompactUnicodeObject;
 
 /* Object format for Unicode subclasses. */
 typedef struct {
-    _PyCompactUnicodeObject _base;
+    PyUnstable_CompactUnicodeObject _base;
     union {
         void *any;
         Py_UCS1 *latin1;
         Py_UCS2 *ucs2;
         Py_UCS4 *ucs4;
     } data;                     /* Canonical, smallest-form Unicode buffer */
-} _PyUnicodeObject;
+} PyUnstable_UnicodeObject;
 
 
-_Py_DEPRECATED_EXTERNALLY(3.14) typedef _PyASCIIObject PyASCIIObject;
-_Py_DEPRECATED_EXTERNALLY(3.14) typedef _PyCompactUnicodeObject PyCompactUnicodeObject;
-_Py_DEPRECATED_EXTERNALLY(3.14) typedef _PyUnicodeObject PyUnicodeObject;
+_Py_DEPRECATED_EXTERNALLY(3.14) typedef PyUnstable_ASCIIObject
+    PyASCIIObject;
+_Py_DEPRECATED_EXTERNALLY(3.14) typedef PyUnstable_CompactUnicodeObject
+    PyCompactUnicodeObject;
+_Py_DEPRECATED_EXTERNALLY(3.14) typedef PyUnstable_UnicodeObject
+    PyUnicodeObject;
 
 #define _PyASCIIObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_CAST(_PyASCIIObject*, (op)))
+     _Py_CAST(PyUnstable_ASCIIObject*, (op)))
 #define _PyCompactUnicodeObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_CAST(_PyCompactUnicodeObject*, (op)))
+     _Py_CAST(PyUnstable_CompactUnicodeObject*, (op)))
 #define _PyUnicodeObject_CAST(op) \
     (assert(PyUnicode_Check(op)), \
-     _Py_CAST(_PyUnicodeObject*, (op)))
+     _Py_CAST(PyUnstable_UnicodeObject*, (op)))
 
 
 /* --- Flexible String Representation Helper Macros (PEP 393) -------------- */

Include/internal/pycore_global_strings.h

@@ -17,7 +17,7 @@ extern "C" {
 
 #define STRUCT_FOR_ASCII_STR(LITERAL) \
     struct { \
-        _PyASCIIObject _ascii; \
+        PyUnstable_ASCIIObject _ascii; \
         uint8_t _data[sizeof(LITERAL)]; \
     }
 #define STRUCT_FOR_STR(NAME, LITERAL) \
@@ -786,11 +786,11 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(zdict)
     } identifiers;
     struct {
-        _PyASCIIObject _ascii;
+        PyUnstable_ASCIIObject _ascii;
         uint8_t _data[2];
     } ascii[128];
     struct {
-        _PyCompactUnicodeObject _latin1;
+        PyUnstable_CompactUnicodeObject _latin1;
         uint8_t _data[2];
     } latin1[128];
 };