[GR-10613] Create the main module eagerly and only fill-in it's attribute form the parsing request

PullRequest: graalpython/98

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java

@@ -46,7 +46,7 @@ public class PythonModuleTests {
     @Test
     public void pythonModuleTest() {
         final PythonContext context = PythonTests.getContext();
-        PythonModule module = context.getCore().factory().createPythonModule("testModule", null);
+        PythonModule module = context.getCore().factory().createPythonModule("testModule");
 
         assertEquals("testModule", module.getAttribute(__NAME__).toString());
         assertEquals("None", module.getAttribute(__DOC__).toString());
@@ -74,7 +74,7 @@ public void builtinsIntTest() {
     @Test
     public void mainModuleTest() {
         final PythonContext context = PythonTests.getContext();
-        PythonModule main = context.createMainModule(null);
+        PythonModule main = context.getMainModule();
         PythonModule builtins = (PythonModule) main.getAttribute(__BUILTINS__);
         PBuiltinFunction abs = (PBuiltinFunction) builtins.getAttribute(BuiltinNames.ABS);
         Object returned = InvokeNode.create(abs).invoke(createWithUserArguments(-42));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -247,7 +247,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         if (!pythonCore.isInitialized()) {
             pythonCore.initialize();
         }
-        context.getOrCreateMainModule(request.getSource().getPath());
+        context.initializeMainModule(request.getSource().getPath());
 
         // if we are running the interpreter, module 'site' is automatically imported
         if (request.getSource().isInteractive()) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -391,7 +391,7 @@ public Object duplicate(Map<Object, Object> replacements, Object value) {
             return value;
         } else if (value instanceof PythonModule) {
             PythonModule module = (PythonModule) value;
-            PythonModule newModule = factory().createPythonModule(module.getModuleName(), module.getModulePath());
+            PythonModule newModule = factory().createPythonModule(module.getModuleName());
             replacements.put(module, newModule);
             for (String attr : module.getAttributeNames()) {
                 newModule.setAttribute(attr, duplicate(replacements, module.getAttribute(attr)));
@@ -676,7 +676,7 @@ private PythonModule createModule(String name, String pkg, PythonBuiltins... bui
     }
 
     public PythonModule createModule(String name, boolean add, PythonBuiltins... builtins) {
-        PythonModule mod = factory().createPythonModule(name, null);
+        PythonModule mod = factory().createPythonModule(name);
         for (PythonBuiltins builtin : builtins) {
             addBuiltinsToModule(mod, builtin);
         }
@@ -779,7 +779,7 @@ private void loadFile(String s, String prefix) {
         PythonModule mod = lookupBuiltinModule(s);
         if (mod == null) {
             // use an anonymous module for the side-effects
-            mod = factory().createPythonModule("__anonymous__", "<bootstrap>");
+            mod = factory().createPythonModule("__anonymous__");
         }
         CallTarget callTarget = Truffle.getRuntime().createCallTarget(parsedModule.getRootNode());
         callTarget.call(PArguments.withGlobals(mod));

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

@@ -44,6 +44,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.TUPLE;
 import static com.oracle.graal.python.nodes.BuiltinNames.TYPE;
 import static com.oracle.graal.python.nodes.BuiltinNames.ZIP;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REVERSED__;
@@ -121,6 +122,7 @@
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
 import com.oracle.graal.python.nodes.builtins.TupleNodes;
 import com.oracle.graal.python.nodes.call.CallDispatchNode;
@@ -133,6 +135,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.JavaTypeConversions;
 import com.oracle.graal.python.runtime.PythonParseResult;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -146,6 +149,7 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
@@ -1193,26 +1197,21 @@ public Object typeGeneric(Object cls, Object name, Object bases, Object dict, PK
 
     @Builtin(name = MODULE, minNumOfArguments = 2, maxNumOfArguments = 3, constructsClass = {PythonModule.class}, isPublic = false)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     @SuppressWarnings("unused")
     public abstract static class ModuleNode extends PythonBuiltinNode {
+        @Child WriteAttributeToObjectNode writeFile = WriteAttributeToObjectNode.create();
+
         @Specialization
         public PythonModule module(Object cls, String name, PNone path) {
-            return factory().createPythonModule(name, null);
+            return factory().createPythonModule(name);
         }
 
         @Specialization
         public PythonModule module(Object cls, String name, String path) {
-            return factory().createPythonModule(name, path);
-        }
-
-        @Specialization
-        public PythonModule module(Object cls, PString name, PNone path) {
-            return factory().createPythonModule(name.getValue(), null);
-        }
-
-        @Specialization
-        public PythonModule module(Object cls, PString name, String path) {
-            return factory().createPythonModule(name.getValue(), path);
+            PythonModule module = factory().createPythonModule(name);
+            writeFile.execute(module, __FILE__, path);
+            return module;
         }
     }
 

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.module;
 
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DOC__;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
 
@@ -35,35 +34,24 @@
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 
 public final class PythonModule extends PythonObject {
-
     private final String name;
-    private final String file;
 
-    public PythonModule(PythonClass clazz, String name, String file) {
+    public PythonModule(PythonClass clazz, String name) {
         super(clazz);
         this.name = name;
-        this.file = file;
         addDefaultConstants(name);
     }
 
     private void addDefaultConstants(String moduleName) {
         setAttribute(__NAME__, moduleName);
         setAttribute(__DOC__, PNone.NONE);
         setAttribute(__PACKAGE__, PNone.NONE);
-
-        if (file != null) {
-            setAttribute(__FILE__, file);
-        }
     }
 
     public String getModuleName() {
         return name;
     }
 
-    public String getModulePath() {
-        return file;
-    }
-
     @Override
     public PythonObject getValidStorageFullLookup(String attributeId) {
         if (isOwnAttribute(attributeId)) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.nodes.BuiltinNames.__BUILTINS__;
 import static com.oracle.graal.python.nodes.BuiltinNames.__MAIN__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__FILE__;
 
 import java.io.OutputStream;
 import java.util.HashMap;
@@ -109,13 +110,6 @@ public PythonModule getBuiltins() {
         return builtinsModule;
     }
 
-    public PythonModule createMainModule(String path) {
-        mainModule = core.factory().createPythonModule(__MAIN__, path);
-        mainModule.setAttribute(__BUILTINS__, sysModules.getItem("builtins"));
-        getSysModules().setItem(__MAIN__, mainModule);
-        return mainModule;
-    }
-
     public TruffleLanguage.Env getEnv() {
         return env;
     }
@@ -129,14 +123,6 @@ public PythonModule getMainModule() {
         return mainModule;
     }
 
-    public PythonModule getOrCreateMainModule(String path) {
-        if (mainModule == null) {
-            return createMainModule(path);
-        } else {
-            return mainModule;
-        }
-    }
-
     public PythonCore getCore() {
         return core;
     }
@@ -177,6 +163,9 @@ public void initialize() {
         PythonModule sysModule = core.createSysModule(this);
         sysModules = (PDict) sysModule.getAttribute("modules");
         builtinsModule = (PythonModule) sysModules.getItem("builtins");
+        mainModule = core.factory().createPythonModule(__MAIN__);
+        mainModule.setAttribute(__BUILTINS__, builtinsModule);
+        sysModules.setItem(__MAIN__, mainModule);
 
         isInitialized = true;
     }
@@ -224,4 +213,9 @@ public PDict getCustomThreadState() {
         return customThreadState.get();
     }
 
+    public void initializeMainModule(String path) {
+        if (path != null) {
+            mainModule.setAttribute(__FILE__, path);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -318,8 +318,8 @@ public PRandom createRandom(PythonClass cls) {
      * Classes, methods and functions
      */
 
-    public PythonModule createPythonModule(String name, String file) {
-        return trace(new PythonModule(lookupClass(PythonBuiltinClassType.PythonModule), name, file));
+    public PythonModule createPythonModule(String name) {
+        return trace(new PythonModule(lookupClass(PythonBuiltinClassType.PythonModule), name));
     }
 
     public PythonClass createPythonClass(PythonClass metaclass, String name, PythonClass[] bases) {