check for valid slot identifier when creating new type

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/test_slot.py

@@ -56,6 +56,15 @@ def test_uninitialized_slot(self):
         obj.world = "world"
         self.assertEqual(obj.world, "world")
 
+    def test_slots_must_be_identifiers(self):
+        class C: __slots__ = ['a', '_1', '_', 'a1']
+        with self.assertRaises(TypeError):
+            class C: __slots__ = ['']
+            class C: __slots__ = ['1']
+            class C: __slots__ = ['1']
+            class C: __slots__ = ['a$']
+        
+        
     def test_dict_and_weakref_are_listed_in_slots(self):
         class D: __slots__ = ['__dict__']
         self.assertEqual(tuple(D.__slots__), ('__dict__',))

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

@@ -260,6 +260,7 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
+import com.oracle.graal.python.builtins.objects.str.StringBuiltins.IsIdentifierNode;
 
 @CoreFunctions(defineModule = BuiltinNames.BUILTINS)
 public final class BuiltinConstructors extends PythonBuiltins {
@@ -2214,6 +2215,7 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                         @Cached GetItemsizeNode getItemSize,
                         @Cached WriteAttributeToObjectNode writeItemSize,
                         @Cached GetBestBaseClassNode getBestBaseNode,
+                        @Cached IsIdentifierNode isIdentifier,
                         @Cached DictBuiltins.CopyNode copyDict) {
             // Determine the proper metatype to deal with this
             String name = castStr.execute(wName);
@@ -2230,7 +2232,8 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
 
             try {
                 PDict namespace = (PDict) copyDict.call(frame, namespaceOrig);
-                PythonClass newType = typeMetaclass(frame, name, bases, namespace, metaclass, lib, hashingStoragelib, getDictAttrNode, getWeakRefAttrNode, getBestBaseNode, getItemSize, writeItemSize);
+                PythonClass newType = typeMetaclass(frame, name, bases, namespace, metaclass, lib, hashingStoragelib, getDictAttrNode, getWeakRefAttrNode, getBestBaseNode, getItemSize, writeItemSize,
+                                isIdentifier);
 
                 for (DictEntry entry : hashingStoragelib.entries(namespace.getDictStorage())) {
                     Object setName = getSetNameNode.execute(entry.value);
@@ -2326,7 +2329,8 @@ private String getModuleNameFromGlobals(PythonObject globals, HashingStorageLibr
 
         private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases, PDict namespace, Object metaclass,
                         PythonObjectLibrary lib, HashingStorageLibrary hashingStorageLib, LookupAttributeInMRONode getDictAttrNode,
-                        LookupAttributeInMRONode getWeakRefAttrNode, GetBestBaseClassNode getBestBaseNode, GetItemsizeNode getItemSize, WriteAttributeToObjectNode writeItemSize) {
+                        LookupAttributeInMRONode getWeakRefAttrNode, GetBestBaseClassNode getBestBaseNode, GetItemsizeNode getItemSize, WriteAttributeToObjectNode writeItemSize,
+                        IsIdentifierNode isIdentifier) {
             Object[] array = ensureGetObjectArrayNode().execute(bases);
 
             PythonAbstractClass[] basesArray;
@@ -2422,6 +2426,9 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
                     // Check valid slot name
                     if (element instanceof String) {
                         slotName = (String) element;
+                        if (!(boolean) isIdentifier.call(frame, slotName)) {
+                            throw raise(TypeError, ErrorMessages.SLOTS_MUST_BE_IDENTIFIERS);
+                        }
                     } else {
                         throw raise(TypeError, ErrorMessages.MUST_BE_STRINGS_NOT_P, "__slots__ items", element);
                     }
@@ -2638,7 +2645,7 @@ private String mangle(String privateobj, String ident) {
             // Name mangling: __private becomes _classname__private. This is independent from how
             // the name is used.
             int nlen, plen, ipriv;
-            if (privateobj == null || ident.charAt(0) != '_' || ident.charAt(1) != '_') {
+            if (privateobj == null || ident.equals("_") || ident.charAt(0) != '_' || ident.charAt(1) != '_') {
                 return ident;
             }
             nlen = ident.length();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -1958,7 +1958,7 @@ protected String getName() {
 
     @Builtin(name = "isidentifier", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    abstract static class IsIdentifierNode extends PythonUnaryBuiltinNode {
+    public abstract static class IsIdentifierNode extends PythonUnaryBuiltinNode {
         @Specialization
         boolean doString(String self) {
             return getCore().getParser().isIdentifier(getCore(), self);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -520,6 +520,7 @@ public abstract class ErrorMessages {
     public static final String WEAKREF_SLOT_DISALLOWED_WE_GOT_ONE = "__weakref__ slot disallowed: either we already got one, or __itemsize__ != 0";
     public static final String STAR_WANTS_INT = "* wants int";
     public static final String TOO_MANY_DECIMAL_DIGITS_IN_FORMAT_STRING = "Too many decimal digits in format string";
+    public static final String SLOTS_MUST_BE_IDENTIFIERS = "__slots__ must be identifiers";
     public static final String STARRED_ASSIGMENT_MUST_BE_IN_LIST_OR_TUPLE = "starred assignment target must be in a list or tuple";
     public static final String STATE_VECTOR_INVALID = "state vector invalid.";
     public static final String STATE_VECTOR_MUST_BE_A_TUPLE = "state vector must be a tuple";