Remove dummy fromlists from importModule calls

Author: msimacek

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

@@ -52,7 +52,6 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectTransfer;
 import static com.oracle.graal.python.nodes.ErrorMessages.CALLED_WITH_INVALID_PY_CAPSULE_OBJECT;
 import static com.oracle.graal.python.nodes.ErrorMessages.PY_CAPSULE_IMPORT_S_IS_NOT_VALID;
-import static com.oracle.graal.python.nodes.statement.AbstractImportNode.T_IMPORT_ALL;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
@@ -364,7 +363,7 @@ static Object doGeneric(TruffleString name, @SuppressWarnings("unused") int noBl
                 }
                 if (object == null) {
                     // noBlock has no effect anymore since 3.3
-                    object = AbstractImportNode.importModule(trace, T_IMPORT_ALL);
+                    object = AbstractImportNode.importModule(trace);
                 } else {
                     object = getAttrNode.execute(object, trace);
                 }

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

@@ -52,7 +52,6 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_GLOBALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_LOCALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T___IMPORT__;
-import static com.oracle.graal.python.nodes.statement.AbstractImportNode.T_IMPORT_ALL;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi5BuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
@@ -76,7 +75,7 @@ public final class PythonCextImportBuiltins {
     abstract static class PyImport_ImportModule extends CApiUnaryBuiltinNode {
         @Specialization
         static Object imp(TruffleString name) {
-            return AbstractImportNode.importModule(name, T_IMPORT_ALL);
+            return AbstractImportNode.importModule(name);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PPickler.java

@@ -50,6 +50,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___REDUCE__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_NEWLINE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_UTF8;
+import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.KeyError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.PicklingError;
@@ -1831,7 +1832,7 @@ private void saveGlobal(VirtualFrame frame, PythonContext ctx, PPickler pickler,
 
             Object module;
             try {
-                module = PickleUtils.importDottedModule(moduleName);
+                module = importModule(moduleName);
             } catch (PException e) {
                 throw raise(PicklingError, ErrorMessages.CANT_PICKLE_P_IMPORT_OF_MODULE_S_FAILED, obj, moduleName);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PickleState.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.builtins.modules.pickle;
 
+import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -105,7 +106,7 @@ void init(PickleState state,
             final PythonModule builtins = context.getBuiltins();
             state.getattr = getAttr.execute(null, inliningTarget, builtins, T_GETATTR);
 
-            final Object copyreg = PickleUtils.importSimpleModule(PickleUtils.T_MOD_COPYREG);
+            final Object copyreg = importModule(PickleUtils.T_MOD_COPYREG);
             state.dispatchTable = getAttr.execute(null, inliningTarget, copyreg, PickleUtils.T_ATTR_DISPATCH_TABLE);
             if (!PGuards.isDict(state.dispatchTable)) {
                 throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.S_SHOULD_BE_A_S_NOT_A_P, "copyreg.dispatch_table", "dict", state.dispatchTable);
@@ -126,17 +127,17 @@ void init(PickleState state,
                 throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.S_SHOULD_BE_A_S_NOT_A_P, "copyreg._extension_cache", "dict", state.extensionCache);
             }
 
-            final Object codecs = PickleUtils.importSimpleModule(PickleUtils.T_MOD_CODECS);
+            final Object codecs = importModule(PickleUtils.T_MOD_CODECS);
             state.codecsEncode = getAttr.execute(null, inliningTarget, codecs, PickleUtils.T_METHOD_ENCODE);
             if (!callableCheck.execute(inliningTarget, state.codecsEncode)) {
                 throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.S_SHOULD_BE_A_S_NOT_A_P, "codecs.encode", "callable", state.codecsEncode);
             }
 
-            final Object functools = PickleUtils.importSimpleModule(PickleUtils.T_MOD_FUNCTOOLS);
+            final Object functools = importModule(PickleUtils.T_MOD_FUNCTOOLS);
             state.partial = getAttr.execute(null, inliningTarget, functools, PickleUtils.T_METHOD_PARTIAL);
 
             // Load the 2.x -> 3.x stdlib module mapping tables
-            Object compatPickle = PickleUtils.importSimpleModule(PickleUtils.T_MOD_COMPAT_PICKLE);
+            Object compatPickle = importModule(PickleUtils.T_MOD_COMPAT_PICKLE);
             state.nameMapping2To3 = getAttr.execute(null, inliningTarget, compatPickle, PickleUtils.T_ATTR_NAME_MAPPING);
             if (!PGuards.isDict(state.nameMapping2To3)) {
                 throw raiseNode.get(inliningTarget).raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.S_SHOULD_BE_A_S_NOT_A_P, PickleUtils.T_CP_NAME_MAPPING, "dict", state.nameMapping2To3);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PickleUtils.java

@@ -41,9 +41,7 @@
 package com.oracle.graal.python.builtins.modules.pickle;
 
 import static com.oracle.graal.python.builtins.modules.pickle.PPickler.BasePickleWriteNode.NEW_LINE_BYTE;
-import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DOT;
-import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
@@ -113,8 +111,6 @@ public final class PickleUtils {
     public static final String J_ATTR_FAST = "fast";
     public static final String J_ATTR_BIN = "bin";
 
-    private static final TruffleString[] SILLY_IMPORT_FROM_LIST = new TruffleString[]{T___DOC__};
-
     public static final int READ_WHOLE_LINE = -1;
 
     public static final int PICKLE_PROTOCOL_HIGHEST = 5;
@@ -232,14 +228,6 @@ public static void writeSize64(byte[] out, int start, int value) {
         }
     }
 
-    public static Object importDottedModule(TruffleString dottedModuleName) {
-        return importModule(dottedModuleName, SILLY_IMPORT_FROM_LIST);
-    }
-
-    public static Object importSimpleModule(TruffleString simpleModuleName) {
-        return importModule(simpleModuleName);
-    }
-
     public static byte[] resize(byte[] src, int newSize) {
         byte[] newBytes = new byte[newSize];
         if (src != null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/pickle/PicklerNodes.java

@@ -51,6 +51,7 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___MODULE__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DOT;
 import static com.oracle.graal.python.nodes.StringLiterals.T_UTF8;
+import static com.oracle.graal.python.nodes.statement.AbstractImportNode.importModule;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
@@ -729,10 +730,7 @@ public Object findClass(VirtualFrame frame, Python3Core core, PUnpickler self, T
 
             // we don't use PyImport_GetModule here, because it can return partially-initialised
             // modules, which then cause the getattribute to fail.
-            Object module = PickleUtils.importDottedModule(mName);
-            if (module == PNone.NONE || module == NO_VALUE) {
-                return null;
-            }
+            Object module = importModule(mName);
             return getattribute(frame, module, gName, self.getProto() >= 4);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/ImportStarNode.java

@@ -29,6 +29,7 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___ALL__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DICT__;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
+import static com.oracle.graal.python.util.PythonUtils.tsArray;
 
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
@@ -51,6 +52,7 @@
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateInline;
@@ -68,6 +70,8 @@
 @GenerateUncached
 @GenerateInline(false) // used in BCI root node
 public abstract class ImportStarNode extends AbstractImportNode {
+    @CompilationFinal(dimensions = 1) private static final TruffleString[] T_IMPORT_ALL = tsArray("*");
+
     public abstract void execute(VirtualFrame frame, TruffleString moduleName, int level);
 
     @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AbstractImportNode.java

@@ -46,7 +46,6 @@
 import static com.oracle.graal.python.nodes.ErrorMessages.IMPORT_NOT_FOUND;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DOT;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
-import static com.oracle.graal.python.util.PythonUtils.tsArray;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 import static com.oracle.graal.python.util.PythonUtils.tsbCapacity;
 import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
@@ -83,7 +82,6 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.dsl.Bind;
@@ -101,7 +99,6 @@
 
 public abstract class AbstractImportNode extends PNodeWithContext {
 
-    @CompilationFinal(dimensions = 1) public static final TruffleString[] T_IMPORT_ALL = tsArray("*");
     public static final TruffleString T__FIND_AND_LOAD = tsLiteral("_find_and_load");
 
     public static PythonModule importModule(TruffleString name) {