Allow any Python string representation in StgDictObject.fieldsNames

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataObject.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
+import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Bind;
@@ -58,7 +59,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
-import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
 @ExportLibrary(PythonBufferAcquireLibrary.class)
@@ -221,7 +221,7 @@ public CDataObjectWrapper(StgDictObject stgDict, byte[] storage) {
             this.nativePointer = null;
         }
 
-        private int getIndex(String field, TruffleString.ToJavaStringNode toJavaStringNode) {
+        private int getIndex(String field, CastToJavaStringNode toJavaStringNode) {
             String[] fields = getMembers(true, toJavaStringNode);
             for (int i = 0; i < fields.length; i++) {
                 if (fields[i].equals(field)) {
@@ -238,7 +238,7 @@ boolean hasMembers() {
 
         @ExportMessage
         String[] getMembers(@SuppressWarnings("unused") boolean includeInternal,
-                        @Shared("ts2js") @Cached TruffleString.ToJavaStringNode toJavaStringNode) {
+                        @Shared @Cached CastToJavaStringNode toJavaStringNode) {
             if (members == null) {
                 members = new String[this.stgDict.fieldsNames.length];
                 for (int i = 0; i < this.stgDict.fieldsNames.length; i++) {
@@ -250,13 +250,13 @@ String[] getMembers(@SuppressWarnings("unused") boolean includeInternal,
 
         @ExportMessage
         boolean isMemberReadable(String member,
-                        @Shared("ts2js") @Cached TruffleString.ToJavaStringNode toJavaStringNode) {
+                        @Shared @Cached CastToJavaStringNode toJavaStringNode) {
             return getIndex(member, toJavaStringNode) != -1;
         }
 
         @ExportMessage
         final boolean isMemberModifiable(String member,
-                        @Shared("ts2js") @Cached TruffleString.ToJavaStringNode toJavaStringNode) {
+                        @Shared @Cached CastToJavaStringNode toJavaStringNode) {
             return isMemberReadable(member, toJavaStringNode);
         }
 
@@ -267,7 +267,7 @@ final boolean isMemberInsertable(@SuppressWarnings("unused") String member) {
 
         @ExportMessage
         Object readMember(String member,
-                        @Shared("ts2js") @Cached TruffleString.ToJavaStringNode toJavaStringNode) throws UnknownIdentifierException {
+                        @Shared @Cached CastToJavaStringNode toJavaStringNode) throws UnknownIdentifierException {
             int idx = getIndex(member, toJavaStringNode);
             if (idx != -1) {
                 return CtypesNodes.getValue(stgDict.fieldsTypes[idx], storage, stgDict.fieldsOffsets[idx]);
@@ -277,7 +277,7 @@ Object readMember(String member,
 
         @ExportMessage
         void writeMember(String member, Object value,
-                        @Shared("ts2js") @Cached TruffleString.ToJavaStringNode toJavaStringNode) throws UnknownIdentifierException {
+                        @Shared @Cached CastToJavaStringNode toJavaStringNode) throws UnknownIdentifierException {
             int idx = getIndex(member, toJavaStringNode);
             if (idx != -1) {
                 CtypesNodes.setValue(stgDict.fieldsTypes[idx], storage, stgDict.fieldsOffsets[idx], value);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StgDictObject.java

@@ -81,7 +81,7 @@ public final class StgDictObject extends PDict {
     int ndim;
     int[] shape;
 
-    TruffleString[] fieldsNames;
+    Object[] fieldsNames;
     int[] fieldsOffsets;
     FFI_TYPES[] fieldsTypes;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/StructUnionTypeBuiltins.java

@@ -101,6 +101,7 @@
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
 import com.oracle.graal.python.nodes.object.SetDictNode;
+import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.dsl.Bind;
@@ -227,6 +228,7 @@ void PyCStructUnionType_update_stgdict(VirtualFrame frame, Object type, Object f
                         @Cached(parameters = "T__pack_") LookupAttributeInMRONode lookupPack,
                         @Cached(parameters = "T__use_broken_old_ctypes_structure_semantics_") LookupAttributeInMRONode lookupBrokenCtypes,
                         @Cached StringUtils.SimpleTruffleStringFormatNode formatNode,
+                        @Cached CastToTruffleStringNode castToTruffleStringNode,
                         @Cached TruffleStringBuilder.AppendStringNode appendStringNode,
                         @Cached TruffleStringBuilder.ToStringNode toStringNode) {
             /*
@@ -329,7 +331,7 @@ void PyCStructUnionType_update_stgdict(VirtualFrame frame, Object type, Object f
                  */
                 stgdict.format = T_UPPER_B;
             }
-            TruffleString[] fieldsNames = new TruffleString[len];
+            Object[] fieldsNames = new Object[len];
             int[] fieldsOffsets = new int[len];
             FFI_TYPES[] fieldsTypes = new FFI_TYPES[len];
 
@@ -346,7 +348,7 @@ void PyCStructUnionType_update_stgdict(VirtualFrame frame, Object type, Object f
                 if (tupleLen < 2 || !PGuards.isString(tuple[0]) || (tupleLen > 2 && !PGuards.isInteger(tuple[2]))) {
                     fieldsError();
                 }
-                TruffleString name = (TruffleString) tuple[0];
+                Object name = tuple[0];
                 Object desc = tuple[1];
                 int bitsize = tupleLen >= 3 ? (int) tuple[2] : 0;
 
@@ -392,7 +394,7 @@ void PyCStructUnionType_update_stgdict(VirtualFrame frame, Object type, Object f
 
                 if (isStruct && !isPacked) {
                     TruffleString fieldfmt = dict.format != null ? dict.format : T_UPPER_B;
-                    TruffleString buf = formatNode.format("%s:%s:", fieldfmt, name);
+                    TruffleString buf = formatNode.format("%s:%s:", fieldfmt, castToTruffleStringNode.execute(name));
 
                     if (dict.shape != null) {
                         stgdict.format = _ctypes_alloc_format_string_with_shape(dict.ndim, dict.shape, stgdict.format, buf, appendStringNode, toStringNode, formatNode);