Create the dict eagerly for modules so it's always there

* graalpython/lib-python/3/test/test_descr.py::test.test_descr.ClassPropertiesAndMethods.test_uninitialized_modules
  caught a case where module.tp_new is called without module.tp_init
  and that caused an NPE from ReadAttributeFromModuleNode.
* It seems much simpler and more efficient to always have that guarantee.

Author: eregon

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/ModuleBuiltins.java

@@ -99,8 +99,6 @@
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
-import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
-import com.oracle.graal.python.nodes.object.SetDictNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -141,8 +139,7 @@ public abstract static class ModuleNewNode extends PythonBuiltinNode {
 
         @Specialization
         @SuppressWarnings("unused")
-        static Object doGeneric(Object cls, Object[] varargs, PKeyword[] kwargs,
-                        @Bind Node inliningTarget,
+        static PythonModule doGeneric(Object cls, Object[] varargs, PKeyword[] kwargs,
                         @Bind PythonLanguage language,
                         @Cached TypeNodes.GetInstanceShape getInstanceShape) {
             return PFactory.createPythonModule(language, cls, getInstanceShape.execute(cls));
@@ -161,15 +158,12 @@ protected ArgumentClinicProvider getArgumentClinic() {
 
         @Specialization
         public PNone module(PythonModule self, TruffleString name, Object doc,
-                        @Bind Node inliningTarget,
                         @Cached WriteAttributeToObjectNode writeName,
                         @Cached WriteAttributeToObjectNode writeDoc,
                         @Cached WriteAttributeToObjectNode writePackage,
                         @Cached WriteAttributeToObjectNode writeLoader,
-                        @Cached WriteAttributeToObjectNode writeSpec,
-                        @Cached GetOrCreateDictNode getDict) {
-            // create dict if missing
-            getDict.execute(inliningTarget, self);
+                        @Cached WriteAttributeToObjectNode writeSpec) {
+            assert GetDictIfExistsNode.getUncached().execute(self) != null : "PythonModule always have a dict";
 
             // init
             writeName.execute(self, T___NAME__, name);
@@ -216,19 +210,14 @@ public abstract static class ModuleDictNode extends PythonBinaryBuiltinNode {
 
         @Specialization(guards = "isNoValue(none)")
         static Object doManaged(PythonModule self, @SuppressWarnings("unused") PNone none,
-                        @Bind Node inliningTarget,
-                        @Exclusive @Cached GetDictIfExistsNode getDict,
-                        @Cached SetDictNode setDict) {
+                        @Exclusive @Cached GetDictIfExistsNode getDict) {
             PDict dict = getDict.execute(self);
-            if (dict == null) {
-                dict = createDict(inliningTarget, self, setDict);
-            }
+            assert dict != null : "PythonModule always have a dict";
             return dict;
         }
 
         @Specialization(guards = "isNoValue(none)")
         static Object doNativeObject(PythonAbstractNativeObject self, @SuppressWarnings("unused") PNone none,
-                        @Bind Node inliningTarget,
                         @Exclusive @Cached GetDictIfExistsNode getDict,
                         @Cached PRaiseNode raiseNode) {
             PDict dict = getDict.execute(self);
@@ -243,12 +232,6 @@ static Object doError(Object self, @SuppressWarnings("unused") Object dict,
                         @Bind Node inliningTarget) {
             throw PRaiseNode.raiseStatic(inliningTarget, PythonBuiltinClassType.TypeError, ErrorMessages.DESCRIPTOR_DICT_FOR_MOD_OBJ_DOES_NOT_APPLY_FOR_P, self);
         }
-
-        private static PDict createDict(Node inliningTarget, PythonModule self, SetDictNode setDict) {
-            PDict dict = PFactory.createDictFixedStorage(PythonLanguage.get(inliningTarget), self);
-            setDict.execute(inliningTarget, self, dict);
-            return dict;
-        }
     }
 
     @Slot(value = SlotKind.tp_getattro, isComplex = true)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonModule.java

@@ -37,11 +37,9 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.object.SetDictNode;
-import com.oracle.graal.python.runtime.object.PFactory;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -78,6 +76,7 @@ public final class PythonModule extends PythonObject {
     private PythonBuiltins builtins;
     private Object moduleState;
 
+    @TruffleBoundary
     public PythonModule(Object clazz, Shape instanceShape) {
         super(clazz, instanceShape);
         setAttribute(T___NAME__, PNone.NO_VALUE);
@@ -87,6 +86,7 @@ public PythonModule(Object clazz, Shape instanceShape) {
         setAttribute(T___SPEC__, PNone.NO_VALUE);
         setAttribute(T___CACHED__, PNone.NO_VALUE);
         setAttribute(T___FILE__, PNone.NO_VALUE);
+        GetOrCreateDictNode.executeUncached(this);
     }
 
     /**
@@ -102,6 +102,7 @@ private PythonModule(PythonLanguage lang, TruffleString moduleName) {
         setAttribute(T___SPEC__, PNone.NONE);
         setAttribute(T___CACHED__, PNone.NO_VALUE);
         setAttribute(T___FILE__, PNone.NO_VALUE);
+        GetOrCreateDictNode.executeUncached(this);
     }
 
     /**
@@ -110,10 +111,7 @@ private PythonModule(PythonLanguage lang, TruffleString moduleName) {
     @TruffleBoundary
     public static PythonModule createInternal(TruffleString moduleName) {
         PythonLanguage language = PythonLanguage.get(null);
-        PythonModule pythonModule = new PythonModule(language, moduleName);
-        PDict dict = PFactory.createDictFixedStorage(language, pythonModule);
-        SetDictNode.executeUncached(pythonModule, dict);
-        return pythonModule;
+        return new PythonModule(language, moduleName);
     }
 
     public PythonBuiltins getBuiltins() {