Fix: always write structseq doc string if given

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/structseq.c

@@ -76,7 +76,7 @@ count_members(PyStructSequence_Desc *desc, Py_ssize_t *n_unnamed_members) {
     return i;
 }
 
-typedef int (*structseq_init_fun_t)(void *, void *, void *, void *, void *, int);
+typedef int (*structseq_init_fun_t)(void *, void *, void *, void *, int);
 UPCALL_TYPED_ID(PyStructSequence_InitType2, structseq_init_fun_t);
 int PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc) {
     Py_ssize_t n_members, n_unnamed_members, n_named_members;
@@ -119,7 +119,6 @@ int PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc)
     return _jls_PyStructSequence_InitType2(
             native_type_to_java(type),
             polyglot_from_string(desc->name, SRC_CS),
-            polyglot_from_string(desc->doc, SRC_CS),
             /* TODO(fa): use polyglot_from_VoidPtr_array once this is visible */
             polyglot_from_PyObjectPtr_array((PyObjectPtr *) field_names, (uint64_t) n_members),
             polyglot_from_PyObjectPtr_array((PyObjectPtr *) field_docs, (uint64_t) n_members),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -4032,17 +4032,17 @@ public void call(@SuppressWarnings("unused") PythonContext context) {
     }
 
     // directly called without landing function
-    @Builtin(name = "PyStructSequence_InitType2", minNumOfPositionalArgs = 6)
+    @Builtin(name = "PyStructSequence_InitType2", minNumOfPositionalArgs = 5)
     @GenerateNodeFactory
     abstract static class PyStructSequenceInitType2 extends NativeBuiltin {
 
         @Specialization(limit = "1")
-        static int doGeneric(Object klass, String typeName, String typeDoc, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
+        static int doGeneric(Object klass, String typeName, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
                         @CachedLanguage PythonLanguage language,
                         @Cached AsPythonObjectNode asPythonObjectNode,
                         @CachedLibrary("fieldNamesObj") InteropLibrary lib,
                         @Cached(parameters = "true") WriteAttributeToObjectNode clearNewNode) {
-            return initializeStructType(asPythonObjectNode.execute(klass), typeName, typeDoc, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
+            return initializeStructType(asPythonObjectNode.execute(klass), typeName, null, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
         }
 
         static int initializeStructType(Object klass, String typeName, String typeDoc, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
@@ -4103,7 +4103,7 @@ Object doGeneric(VirtualFrame frame, String typeName, String typeDoc, Object fie
                 PTuple bases = factory().createTuple(new Object[]{PythonBuiltinClassType.PTuple});
                 PDict namespace = factory().createDict(new PKeyword[]{new PKeyword(SpecialAttributeNames.__DOC__, typeDoc)});
                 Object cls = callTypeNewNode.execute(typeBuiltin, typeName, bases, namespace);
-                PyStructSequenceInitType2.initializeStructType(cls, typeName, typeDoc, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
+                PyStructSequenceInitType2.initializeStructType(cls, typeName, null, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
                 return toNewRefNode.execute(cls);
             } catch (PException e) {
                 transformToNative(frame, e);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/StructSequence.java

@@ -219,10 +219,10 @@ public static void initType(PythonLanguage language, Object klass, Descriptor de
 
         WriteAttributeToObjectNode writeAttrNode = WriteAttributeToObjectNode.getUncached(true);
         /*
-         * Only set __doc__ if not yet done. This is usually the case when initializing a native
-         * class where 'tp_doc' is set in native code already.
+         * Only set __doc__ if given. It may be 'null' e.g. in case of initializing a native class
+         * where 'tp_doc' is set in native code already.
          */
-        if (ReadAttributeFromObjectNode.getUncachedForceType().execute(klass, __DOC__) == PNone.NO_VALUE) {
+        if (desc.docString != null) {
             writeAttrNode.execute(klass, __DOC__, desc.docString);
         }
         writeAttrNode.execute(klass, N_SEQUENCE_FIELDS, desc.inSequence);