never allow setting attributes on built-in objects through the normal WriteToObject node path

Author: timfel

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

@@ -86,6 +86,7 @@
 import com.oracle.graal.python.builtins.objects.function.PythonCallable;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.iterator.PSequenceIterator;
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.slice.PSlice.SliceInfo;
@@ -524,6 +525,24 @@ PHashingCollection getDict(PythonNativeClass object) {
         }
     }
 
+    @Builtin(name = "PyTruffle_SetAttr", fixedNumOfArguments = 3)
+    @GenerateNodeFactory
+    abstract static class PyObject_Setattr extends PythonBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        Object setattr(PythonBuiltinObject object, String key, Object value) {
+            object.getStorage().define(key, value);
+            return PNone.NONE;
+        }
+
+        @Specialization
+        @TruffleBoundary
+        Object setattr(PythonNativeClass object, String key, Object value) {
+            object.getStorage().define(key, value);
+            return PNone.NONE;
+        }
+    }
+
     @Builtin(name = "PyType_Ready", fixedNumOfArguments = 4)
     @GenerateNodeFactory
     abstract static class PyType_ReadyNode extends PythonBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java

@@ -51,7 +51,7 @@ public void setAttribute(Object name, Object value) {
         if (name instanceof HiddenKey || !PythonLanguage.getCore().isInitialized()) {
             setAttributeUnsafe(name, value);
         } else {
-            throw PythonLanguage.getCore().raise(TypeError, "can't set attributes of built-in/extension type '%p'", name);
+            throw PythonLanguage.getCore().raise(TypeError, "can't set attributes of built-in/extension type '%s'", this);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/WriteAttributeToObjectNode.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.attributes;
 
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -52,6 +53,7 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.FinalLocationException;
+import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.object.IncompatibleLocationException;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Property;
@@ -91,8 +93,17 @@ private void handlePythonClass(PythonObject object, Object key) {
         }
     }
 
+    protected static boolean isHiddenKey(Object key) {
+        return key instanceof HiddenKey;
+    }
+
+    protected static boolean isBuiltinObject(Object object) {
+        return object instanceof PythonBuiltinObject;
+    }
+
     @SuppressWarnings("unused")
     @Specialization(guards = {
+                    "!isBuiltinObject(object) || isHiddenKey(key)",
                     "object.getStorage().getShape() == cachedShape",
                     "!layoutAssumption.isValid()"
     })
@@ -111,6 +122,7 @@ protected static boolean compareKey(Object cachedKey, Object key) {
     @SuppressWarnings("unused")
     @Specialization(limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", //
                     guards = {
+                                    "!isBuiltinObject(object) || isHiddenKey(key)",
                                     "object.getStorage().getShape() == cachedShape",
                                     "compareKey(cachedKey, key)",
                                     "loc != null",
@@ -140,6 +152,7 @@ protected boolean doDirect(PythonObject object, Object key, Object value,
     @SuppressWarnings("unused")
     @Specialization(limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", //
                     guards = {
+                                    "!isBuiltinObject(object) || isHiddenKey(key)",
                                     "object.getStorage().getShape() == cachedShape",
                                     "compareKey(cachedKey, key)",
                                     "loc == null || !loc.canSet(value)",

graalpython/lib-graalpython/memoryview.py

@@ -42,13 +42,14 @@
 
 def __memoryview_init(self, *args, **kwargs):
     import _memoryview
+    from python_cext import PyTruffle_SetAttr
     # NOTE: DO NOT CHANGE THE NAME OF PROPERTY '__c_memoryview'
     # it is also referenced in native code and Java code
     if args and isinstance(args[0], _memoryview.nativememoryview):
         # wrapping case
-        self.__c_memoryview = args[0]
+        PyTruffle_SetAttr(self, "__c_memoryview", args[0])
     else:
-        self.__c_memoryview = _memoryview.nativememoryview(*args, **kwargs)
+        PyTruffle_SetAttr(self, "__c_memoryview", _memoryview.nativememoryview(*args, **kwargs))
 
 
 def __memoryview_getitem(self, key):

graalpython/lib-graalpython/python_cext.py

@@ -693,8 +693,8 @@ def AddFunction(primary, name, cfunc, cwrapper, wrapper, doc, isclass=False, iss
             func = classmethod(func)
         elif isstatic:
             func = cstaticmethod(func)
-        func.__name__ = name
-        func.__doc__ = doc
+        PyTruffle_SetAttr(func, "__name__", name)
+        PyTruffle_SetAttr(func, "__doc__", doc)
         if name == "__init__":
             def __init__(self, *args, **kwargs):
                 if func(self, *args, **kwargs) != 0:
@@ -706,10 +706,10 @@ def __init__(self, *args, **kwargs):
 
 def PyCFunction_NewEx(name, cfunc, cwrapper, wrapper, self, module, doc):
     func = wrapper(CreateFunction(name, cfunc, cwrapper))
-    func.__name__ = name
-    func.__doc__ = doc
+    PyTruffle_SetAttr(func, "__name__", name)
+    PyTruffle_SetAttr(func, "__doc__", doc)
     method = PyTruffle_BuiltinMethod(self, func)
-    method.__module__ = module.__name__
+    PyTruffle_SetAttr(method, "__module__", module.__name__)
     return method
 
 
@@ -752,8 +752,8 @@ def member_setter(self, value):
         fset = lambda self, value: GetSet_SetNotWritable(self, value, name)
 
     getset = PyTruffle_GetSetDescriptor(fget=fget, fset=fset, name=name, owner=pclass)
-    getset.__doc__ = doc
-    PyType_Dict(pclass)[name] = getset
+    PyTruffle_SetAttr(getset, "__doc__", doc)
+    PyTruffle_SetAttr(pclass, name, getset)
 
 
 def GetSet_SetNotWritable(self, value, attr):