Avoid subclasses in WriteAttributeToObjectNode

* Using the correct subclass is prone to errors.
* Subclasses prevent host inlining.

Author: eregon

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

@@ -1014,19 +1014,19 @@ abstract static class PyObjectSetAttrNode extends PNodeWithContext {
 
         @Specialization
         static void doBuiltinClass(PythonBuiltinClass object, TruffleString key, Object value,
-                        @Exclusive @Cached(value = "createForceType()", inline = false) WriteAttributeToObjectNode writeAttrNode) {
+                        @Exclusive @Cached WriteAttributeToObjectNode writeAttrNode) {
             writeAttrNode.execute(object, key, value);
         }
 
         @Specialization
         static void doNativeClass(PythonNativeClass object, TruffleString key, Object value,
-                        @Exclusive @Cached(value = "createForceType()", inline = false) WriteAttributeToObjectNode writeAttrNode) {
+                        @Exclusive @Cached WriteAttributeToObjectNode writeAttrNode) {
             writeAttrNode.execute(object, key, value);
         }
 
         @Specialization(guards = {"!isPythonBuiltinClass(object)"})
         static void doObject(PythonObject object, TruffleString key, Object value,
-                        @Exclusive @Cached(inline = false) WriteAttributeToPythonObjectNode writeAttrToPythonObjectNode) {
+                        @Exclusive @Cached WriteAttributeToPythonObjectNode writeAttrToPythonObjectNode) {
             writeAttrToPythonObjectNode.execute(object, key, value);
         }
     }

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

@@ -135,7 +135,7 @@ private static void createGetSet(PythonLanguage language, Object type, NodeFacto
         PBuiltinFunction getter = PFactory.createBuiltinFunction(language, name, type, 1, flags, rawCallTarget);
         GetSetDescriptor callable = PFactory.createGetSetDescriptor(language, getter, getter, name, type, false);
         callable.setAttribute(T___DOC__, toTruffleStringUncached(builtin.doc()));
-        WriteAttributeToObjectNode.getUncached(true).execute(type, name, callable);
+        WriteAttributeToObjectNode.getUncached().execute(type, name, callable);
     }
 
     @Builtin(name = "raw", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true, doc = "value")

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

@@ -132,7 +132,7 @@ private static void addClassMethod(PythonLanguage language, Object type, NodeFac
         PBuiltinFunction function = PFactory.createBuiltinFunction(language, name, type, 1, flags, callTarget);
         PDecoratedMethod classMethod = PFactory.createClassmethodFromCallableObj(language, function);
         function.setAttribute(T___DOC__, builtinDoc);
-        WriteAttributeToObjectNode.getUncached(true).execute(type, name, classMethod);
+        WriteAttributeToObjectNode.getUncached().execute(type, name, classMethod);
     }
 
     @ImportStatic(CDataTypeBuiltins.class)

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

@@ -182,7 +182,7 @@ public static void initType(PythonContext context, PythonAbstractClass klass, De
                 unnamedFields++;
             }
         }
-        WriteAttributeToObjectNode writeAttrNode = WriteAttributeToObjectNode.getUncached(true);
+        WriteAttributeToObjectNode writeAttrNode = WriteAttributeToObjectNode.getUncached();
         if (klass instanceof PythonManagedClass managedClass) {
             /*
              * The methods and slots are already set for each PBCT, but we need to store the field
@@ -220,7 +220,7 @@ public static void initType(PythonContext context, PythonAbstractClass klass, De
     private static void copyMethod(PythonLanguage language, PythonAbstractClass klass, TruffleString name, PythonBuiltinClass template) {
         PBuiltinFunction templateMethod = (PBuiltinFunction) template.getAttribute(name);
         PBuiltinFunction method = PFactory.createBuiltinFunction(language, templateMethod, klass);
-        WriteAttributeToObjectNode.getUncached(true).execute(klass, name, method);
+        WriteAttributeToObjectNode.getUncached().execute(klass, name, method);
     }
 
     private static void createMember(PythonLanguage language, Object klass, TruffleString name, TruffleString doc, int idx) {
@@ -230,7 +230,7 @@ private static void createMember(PythonLanguage language, Object klass, TruffleS
         if (doc != null) {
             callable.setAttribute(T___DOC__, doc);
         }
-        WriteAttributeToObjectNode.getUncached(true).execute(klass, name, callable);
+        WriteAttributeToObjectNode.getUncached().execute(klass, name, callable);
     }
 
     private static class GetStructMemberNode extends PRootNode {

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

@@ -622,7 +622,7 @@ static void set(VirtualFrame frame, Object object, Object keyObject, Object valu
                         @Bind Node inliningTarget,
                         @Cached CastToTruffleStringChecked0Node castKeyNode,
                         @Cached ObjectNodes.GenericSetAttrNode genericSetAttrNode,
-                        @Cached("createForceType()") WriteAttributeToObjectNode write) {
+                        @Cached WriteAttributeToObjectNode write) {
             TruffleString key = castKeyNode.cast(inliningTarget, keyObject, ATTR_NAME_MUST_BE_STRING);
             genericSetAttrNode.execute(inliningTarget, frame, object, key, value, write);
         }
@@ -633,7 +633,7 @@ void setBuiltin(Object object, Object key, Object value) {
             if (PythonContext.get(this).isInitialized()) {
                 throw PRaiseNode.raiseStatic(this, TypeError, ErrorMessages.CANT_SET_ATTRIBUTE_R_OF_IMMUTABLE_TYPE_N, PyObjectReprAsTruffleStringNode.executeUncached(key), object);
             } else {
-                set(null, object, key, value, null, CastToTruffleStringChecked0Node.getUncached(), ObjectNodes.GenericSetAttrNode.getUncached(), WriteAttributeToObjectNode.getUncached(true));
+                set(null, object, key, value, null, CastToTruffleStringChecked0Node.getUncached(), ObjectNodes.GenericSetAttrNode.getUncached(), WriteAttributeToObjectNode.getUncached());
             }
         }
 
@@ -953,7 +953,7 @@ static Object getModule(PythonClass cls, @SuppressWarnings("unused") PNone value
 
         @Specialization(guards = "!isNoValue(value)")
         static Object setModule(PythonClass cls, Object value,
-                        @Cached WriteAttributeToObjectNode writeAttrNode) {
+                        @Shared @Cached WriteAttributeToObjectNode writeAttrNode) {
             writeAttrNode.execute(cls, T___MODULE__, value);
             return PNone.NONE;
         }
@@ -991,13 +991,13 @@ static Object getModule(PythonAbstractNativeObject cls, @SuppressWarnings("unuse
         static Object setNative(PythonAbstractNativeObject cls, Object value,
                         @Bind Node inliningTarget,
                         @Shared @Cached GetTypeFlagsNode getFlags,
-                        @Cached("createForceType()") WriteAttributeToObjectNode writeAttr,
+                        @Shared @Cached WriteAttributeToObjectNode writeAttrNode,
                         @Shared @Cached PRaiseNode raiseNode) {
             long flags = getFlags.execute(cls);
             if ((flags & TypeFlags.HEAPTYPE) == 0) {
                 throw raiseNode.raise(inliningTarget, TypeError, ErrorMessages.CANT_SET_N_S, cls, T___MODULE__);
             }
-            writeAttr.execute(cls, T___MODULE__, value);
+            writeAttrNode.execute(cls, T___MODULE__, value);
             return PNone.NONE;
         }