Remove type name from structseq descriptor

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 *, int);
+typedef int (*structseq_init_fun_t)(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;
@@ -118,7 +118,6 @@ int PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc)
     // this initializes the type dict (adds attributes)
     return _jls_PyStructSequence_InitType2(
             native_type_to_java(type),
-            polyglot_from_string(desc->name, 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

@@ -187,7 +187,7 @@
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.StructSequence;
-import com.oracle.graal.python.builtins.objects.tuple.StructSequence.StructSequenceDescriptor;
+import com.oracle.graal.python.builtins.objects.tuple.StructSequence.Descriptor;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -4032,20 +4032,20 @@ public void call(@SuppressWarnings("unused") PythonContext context) {
     }
 
     // directly called without landing function
-    @Builtin(name = "PyStructSequence_InitType2", minNumOfPositionalArgs = 5)
+    @Builtin(name = "PyStructSequence_InitType2", minNumOfPositionalArgs = 4)
     @GenerateNodeFactory
     abstract static class PyStructSequenceInitType2 extends NativeBuiltin {
 
         @Specialization(limit = "1")
-        static int doGeneric(Object klass, String typeName, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
+        static int doGeneric(Object klass, 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, null, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
+            return initializeStructType(asPythonObjectNode.execute(klass), fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
         }
 
-        static int initializeStructType(Object klass, String typeName, String typeDoc, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
+        static int initializeStructType(Object klass, Object fieldNamesObj, Object fieldDocsObj, int nInSequence,
                         PythonLanguage language,
                         InteropLibrary lib,
                         WriteAttributeToObjectNode clearNewNode) {
@@ -4065,7 +4065,7 @@ static int initializeStructType(Object klass, String typeName, String typeDoc, O
                     fieldDocs[i] = cast(lib.readArrayElement(fieldDocsObj, i));
                 }
                 clearNewNode.execute(klass, __NEW__, PNone.NO_VALUE);
-                StructSequenceDescriptor d = new StructSequenceDescriptor(typeName, typeDoc, nInSequence, fieldNames, fieldDocs);
+                Descriptor d = new Descriptor(null, nInSequence, fieldNames, fieldDocs);
                 StructSequence.initType(language, klass, d);
                 return 0;
             } catch (UnsupportedMessageException | InvalidArrayIndexException e) {
@@ -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, null, fieldNamesObj, fieldDocsObj, nInSequence, language, lib, clearNewNode);
+                PyStructSequenceInitType2.initializeStructType(cls, 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

@@ -122,7 +122,11 @@ public class StructSequence {
     /** The number of unnamed fields. */
     public static final String N_UNNAMED_FIELDS = "n_unnamed_fields";
 
-    abstract static class Descriptor {
+    /**
+     * The equivalent of {@code PyStructSequence_Desc} except of the {@code name}. We don't need the
+     * type's name in the descriptor and this will improve code sharing.
+     */
+    public static class Descriptor {
         public final String docString;
         public final int inSequence;
         public final String[] fieldNames;
@@ -223,18 +227,6 @@ public int hashCode() {
         }
     }
 
-    /**
-     * The equivalent of {@code PyStructSequence_Desc}.
-     */
-    public static final class StructSequenceDescriptor extends Descriptor {
-        public final String name;
-
-        public StructSequenceDescriptor(String name, String docString, int inSequence, String[] fieldNames, String[] fieldDocStrings) {
-            super(docString, inSequence, fieldNames, fieldDocStrings, true);
-            this.name = name;
-        }
-    }
-
     @TruffleBoundary
     public static void initType(Python3Core core, BuiltinTypeDescriptor desc) {
         initType(core.getLanguage(), core.lookupType(desc.type), desc);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -143,7 +143,6 @@
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.StructSequence.BuiltinTypeDescriptor;
-import com.oracle.graal.python.builtins.objects.tuple.StructSequence.StructSequenceDescriptor;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
@@ -398,11 +397,6 @@ public final PTuple createStructSeq(BuiltinTypeDescriptor desc, Object... values
         return createTuple(desc.type, new ObjectSequenceStorage(values, desc.inSequence));
     }
 
-    public final PTuple createStructSeq(Object cls, StructSequenceDescriptor desc, Object... values) {
-        assert desc.inSequence <= values.length && values.length <= desc.fieldNames.length;
-        return createTuple(cls, new ObjectSequenceStorage(values, desc.inSequence));
-    }
-
     public final PComplex createComplex(Object cls, double real, double imag) {
         return trace(new PComplex(cls, getShape(cls), real, imag));
     }