Handle PyUnicode object state layout changes in 3.14t

Signed-off-by: Matt Wozniski <[email protected]>

Author: godlygeek

src/pystack/_pystack/cpython/string.h

@@ -109,4 +109,22 @@ typedef struct
 
 }  // namespace Python3_12
 
+namespace Python3_14t {
+
+struct _PyUnicode_State
+{
+    unsigned char interned;
+    unsigned int kind : 3;
+    unsigned int compact : 1;
+    unsigned int ascii : 1;
+    unsigned int statically_allocated : 1;
+};
+
+}  // namespace Python3_14t
+
+union AnyPyUnicodeState {
+    Python3::_PyUnicode_State python3;
+    Python3_14t::_PyUnicode_State python3_14t;
+};
+
 }  // namespace pystack

src/pystack/_pystack/process.cpp

@@ -540,9 +540,15 @@ AbstractProcessManager::getStringFromAddress(remote_addr_t addr) const
                    << addr;
         Structure<py_unicode_v> unicode(shared_from_this(), addr);
 
-        Python3::_PyUnicode_State state = unicode.getField(&py_unicode_v::o_state);
-        if (state.kind != 1 || state.compact != 1) {
-            throw InvalidRemoteObject();
+        AnyPyUnicodeState state = unicode.getField(&py_unicode_v::o_state);
+        if (versionIsAtLeast(3, 14) and isFreeThreaded()) {
+            if (state.python3_14t.kind != 1 || state.python3_14t.compact != 1) {
+                throw InvalidRemoteObject();
+            }
+        } else {
+            if (state.python3.kind != 1 || state.python3.compact != 1) {
+                throw InvalidRemoteObject();
+            }
         }
 
         len = unicode.getField(&py_unicode_v::o_length);

src/pystack/_pystack/version.h

@@ -77,7 +77,7 @@ struct py_bytes_v
 struct py_unicode_v
 {
     ssize_t size;
-    FieldOffset<Python3::_PyUnicode_State> o_state;
+    FieldOffset<AnyPyUnicodeState> o_state;
     FieldOffset<Py_ssize_t> o_length;
     FieldOffset<remote_addr_t> o_ascii;
 };