[GR-19738] Review all users of ExplodeLoop

timfel · timfel · commit 21a011b27c20 · 2019-12-02T10:53:13.000Z
PullRequest: graalpython/743
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ overlay: "73db7dffa2266bb7e9f00fd8c6725480547b6365" }
+{ overlay: "ce65e9108577ef31130e4646ea4e7df0368a6358" }
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -491,11 +491,11 @@ private void evalNonInteractive(Context context) throws IOException {
             } catch (IOException e) {
             }
             File f = new File(inputFile);
-            if (f.isFile() && (mimeType == null || !mimeType.equals("application/zip"))) {
-                src = Source.newBuilder(getLanguageId(), f).mimeType(MIME_TYPE).build();
-            } else {
+            if (f.isDirectory() || (mimeType != null && mimeType.equals("application/zip"))) {
                 String runMod = String.format("import sys; sys.path.insert(0, '%s'); import runpy; runpy._run_module_as_main('__main__', False)", inputFile);
                 src = Source.newBuilder(getLanguageId(), runMod, "<string>").build();
+            } else {
+                src = Source.newBuilder(getLanguageId(), f).mimeType(MIME_TYPE).build();
             }
         }
         context.eval(src);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java
@@ -85,6 +85,7 @@
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.nodes.ExecutableNode;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -134,7 +135,7 @@ public static int getNumberOfSpecialSingletons() {
         return CONTEXT_INSENSITIVE_SINGLETONS.length;
     }
 
-    @ExplodeLoop
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     public static int getSingletonNativePtrIdx(Object obj) {
         for (int i = 0; i < CONTEXT_INSENSITIVE_SINGLETONS.length; i++) {
             if (CONTEXT_INSENSITIVE_SINGLETONS[i] == obj) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -195,6 +195,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.NodeVisitor;
@@ -1126,7 +1127,7 @@ boolean isInstance(VirtualFrame frame, Object instance, PythonAbstractClass cls,
         }
 
         @Specialization(guards = "getLength(clsTuple) == cachedLen", limit = "getVariableArgumentInlineCacheLimit()")
-        @ExplodeLoop
+        @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
         boolean isInstanceTupleConstantLen(VirtualFrame frame, Object instance, PTuple clsTuple,
                         @Cached("getLength(clsTuple)") int cachedLen,
                         @Cached("create()") IsInstanceNode isInstanceNode) {
@@ -1195,7 +1196,7 @@ private boolean isSubclassCheckInternal(VirtualFrame frame, Object derived, Obje
         }
 
         @Specialization(guards = "getLength(clsTuple) == cachedLen", limit = "getVariableArgumentInlineCacheLimit()")
-        @ExplodeLoop
+        @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
         public boolean isSubclassTupleConstantLen(VirtualFrame frame, Object derived, PTuple clsTuple,
                         @Cached("getLength(clsTuple)") int cachedLen,
                         @Cached("create()") IsSubClassNode isSubclassNode) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java
@@ -193,6 +193,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
@@ -220,6 +221,7 @@
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeVisitor;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -1151,10 +1153,11 @@ private static ByteBuffer readWithSize(InteropLibrary arrLib, InteropLibrary ele
             return buf;
         }
 
-        @ExplodeLoop
+        @ExplodeLoop(kind = LoopExplosionKind.FULL_EXPLODE_UNTIL_RETURN)
         private static int readElement(InteropLibrary arrLib, InteropLibrary elemLib, Object arr, int i, int elementSize)
                         throws InvalidArrayIndexException, UnsupportedMessageException, IllegalElementTypeException {
             byte[] barr = new byte[4];
+            CompilerAsserts.partialEvaluationConstant(elementSize);
             for (int j = 0; j < elementSize; j++) {
                 Object elem = arrLib.readArrayElement(arr, i + j);
                 // The array object could be one of our wrappers (e.g. 'PySequenceArrayWrapper').
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/HandleCache.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/HandleCache.java
@@ -57,6 +57,7 @@
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
@@ -161,7 +162,7 @@ protected static int lookupPositionUncached(HandleCache cache, long handle, int
             return lookupPosition(cache, handle, len, ptrToResolveHandle, InteropLibrary.getFactory().getUncached(ptrToResolveHandle));
         }
 
-        @ExplodeLoop
+        @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
         protected static int lookupPosition(HandleCache cache, long handle, int cachedLen, TruffleObject ptrToResolveHandle, InteropLibrary interopLibrary)
                         throws UnsupportedTypeException, ArityException, UnsupportedMessageException {
             for (int i = 0; i < cachedLen; i++) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeCAPISymbols.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeCAPISymbols.java
@@ -103,7 +103,7 @@ public abstract class NativeCAPISymbols {
         }
     }
 
-    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL)
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     public static boolean isValid(String name) {
         for (int i = 0; i < values.length; i++) {
             if (values[i].equals(name)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyMappingMethodsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyMappingMethodsWrapper.java
@@ -49,6 +49,7 @@
 
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -61,6 +62,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
@@ -71,13 +73,13 @@
 @ExportLibrary(NativeTypeLibrary.class)
 public class PyMappingMethodsWrapper extends PythonNativeWrapper {
 
-    private static final String[] MAPPING_METHODS = new String[]{
+    @CompilationFinal(dimensions = 1) private static final String[] MAPPING_METHODS = new String[]{
                     MP_LENGTH,
                     MP_SUBSCRIPT,
                     MP_ASS_SUBSCRIPT,
     };
 
-    private static final String[] MAPPING_METHODS_MAPPING = new String[]{
+    @CompilationFinal(dimensions = 1) private static final String[] MAPPING_METHODS_MAPPING = new String[]{
                     __LEN__,
                     __GETITEM__,
                     __SETITEM__,
@@ -157,7 +159,7 @@ protected static boolean eq(String expected, String actual) {
         }
     }
 
-    @ExplodeLoop
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     private static String translate(String key) {
         for (int i = 0; i < MAPPING_METHODS.length; i++) {
             if (MAPPING_METHODS[i].equals(key)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PyNumberMethodsWrapper.java
@@ -66,6 +66,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -78,6 +79,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
 
@@ -89,7 +91,7 @@
 @ImportStatic(SpecialMethodNames.class)
 public class PyNumberMethodsWrapper extends PythonNativeWrapper {
 
-    private static final String[] NUMBER_METHODS = new String[]{
+    @CompilationFinal(dimensions = 1) private static final String[] NUMBER_METHODS = new String[]{
                     NB_ADD,
                     NB_SUBTRACT,
                     NB_REMAINDER,
@@ -103,7 +105,7 @@ public class PyNumberMethodsWrapper extends PythonNativeWrapper {
                     NB_INPLACE_MULTIPLY
     };
 
-    private static final String[] NUMBER_METHODS_MAPPING = new String[]{
+    @CompilationFinal(dimensions = 1) private static final String[] NUMBER_METHODS_MAPPING = new String[]{
                     __ADD__,
                     __SUB__,
                     __MOD__,
@@ -191,7 +193,7 @@ protected static boolean eq(String expected, String actual) {
         }
     }
 
-    @ExplodeLoop
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     private static String translate(String key) {
         for (int i = 0; i < NUMBER_METHODS.length; i++) {
             if (NUMBER_METHODS[i].equals(key)) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java
@@ -76,6 +76,7 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
@@ -742,7 +743,7 @@ protected abstract static class FindKwDefaultNode extends Node {
         public abstract PKeyword execute(PKeyword[] kwdefaults, String kwname);
 
         @Specialization(guards = {"kwdefaults.length == cachedLength", "kwdefaults.length < 32"})
-        @ExplodeLoop
+        @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
         PKeyword doCached(PKeyword[] kwdefaults, String kwname,
                         @Cached("kwdefaults.length") int cachedLength) {
             for (int j = 0; j < cachedLength; j++) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarKeywordsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ReadVarKeywordsNode.java
@@ -38,6 +38,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.NodeInfo;
 
 @NodeInfo(shortName = "**kwargs")
@@ -91,7 +92,6 @@ private Object returnValue(PKeyword[] keywords) {
     }
 
     @Specialization(guards = {"getKwargLen(frame) == cachedLen", "cachedLen == 0"}, limit = "1")
-    @ExplodeLoop
     Object noKeywordArgs(@SuppressWarnings("unused") VirtualFrame frame,
                     @SuppressWarnings("unused") @Cached("getAndCheckKwargLen(frame)") int cachedLen) {
         return returnValue(PKeyword.EMPTY_KEYWORDS);
@@ -108,15 +108,7 @@ Object extractKwargs(VirtualFrame frame,
         for (int j = 0; j < cachedLen; j++) {
             PKeyword keyword = keywordArguments[j];
             String kwName = keyword.getName();
-            boolean kwFound = false;
-            for (String name : keywordNames) {
-                if (kwName.equals(name)) {
-                    // Note: rather than skipping the rest of the loop,
-                    // to properly explode the loop in this case, we want
-                    // constant iteration count
-                    kwFound = true;
-                }
-            }
+            boolean kwFound = searchKeyword(kwName);
             if (!kwFound) {
                 remArguments[i] = keyword;
                 i++;
@@ -129,6 +121,16 @@ Object extractKwargs(VirtualFrame frame,
         }
     }
 
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
+    private boolean searchKeyword(String kwName) {
+        for (String name : keywordNames) {
+            if (kwName.equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Specialization(replaces = "extractKwargs")
     Object extractVariableKwargs(VirtualFrame frame) {
         PKeyword[] keywordArguments = PArguments.getKeywordArguments(frame);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java
@@ -88,7 +88,6 @@ protected static boolean compareStrings(String key, String cachedKey) {
         }
 
         @Specialization(guards = "compareStrings(key, cachedKey)", limit = "2")
-        @ExplodeLoop
         protected Object lookupConstantMRO(LazyPythonClass klass, @SuppressWarnings("unused") String key,
                         @Cached("key") @SuppressWarnings("unused") String cachedKey,
                         @Cached("create(key)") LookupAttributeInMRONode lookup) {
@@ -232,7 +231,7 @@ protected ReadAttributeFromObjectNode[] create(int size) {
     @Specialization(guards = {"isSameType(cachedKlass, klass)", "mroLength < 32"}, //
                     limit = "getAttributeAccessInlineCacheMaxDepth()", //
                     assumptions = {"lookupStable", "singleContextAssumption()"})
-    @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.FULL_EXPLODE_UNTIL_RETURN)
+    @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     protected Object lookupConstantMRO(@SuppressWarnings("unused") PythonAbstractClass klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonAbstractClass cachedKlass,
                     @Cached("getMro(cachedKlass)") MroSequenceStorage mro,
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/IsSubtypeNode.java
@@ -64,6 +64,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
@@ -105,16 +106,15 @@ protected boolean isSubMro(LazyPythonClass base, MroSequenceStorage derivedMro,
         }
     }
 
-    @ExplodeLoop
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     protected boolean isInMro(LazyPythonClass cls, MroSequenceStorage mro, int sz) {
-        boolean matched = false;
         PythonAbstractClass[] mroAry = mro.getInternalClassArray();
         for (int i = 0; i < sz; i++) {
             if (isSameType(mroAry[i], cls)) {
-                matched = true;
+                return true;
             }
         }
-        return matched;
+        return false;
     }
 
     protected PythonBuiltinClassType getType(LazyPythonClass cls) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/DictLiteralNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/DictLiteralNode.java
@@ -77,14 +77,12 @@ private Keys evalKeys(VirtualFrame frame) {
     @ExplodeLoop
     private HashingStorage evalAndSetValues(VirtualFrame frame, HashingStorage dictStorage, Keys evalKeys) {
         HashingStorage storage = dictStorage;
+        if (setItemNode == null && values.length > 0) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            setItemNode = insert(SetItemNode.create());
+        }
         for (int i = 0; i < values.length; i++) {
             final Object val = values[i].execute(frame);
-
-            if (setItemNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                setItemNode = insert(SetItemNode.create());
-            }
-
             storage = setItemNode.execute(frame, storage, evalKeys.keys[i], val);
         }
         return storage;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/FormatStringLiteralNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/FormatStringLiteralNode.java
@@ -41,16 +41,16 @@
 
 package com.oracle.graal.python.nodes.literal;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
-import java.util.ArrayList;
-import java.util.List;
 
 public class FormatStringLiteralNode extends LiteralNode {
 
@@ -141,7 +141,6 @@ private static String getText(StringBuilder result) {
         return result.toString();
     }
 
-    @ExplodeLoop
     private void parse(VirtualFrame frame) {
         // create tokens
         tokens = createTokens(this, values, true);
@@ -252,7 +251,7 @@ protected static String[] createExpressionSources(StringPart[] values, int[][] t
      * node.value[token[1]] token[3] - end of the text in the node.value[token[1]] token[4] - only
      * for expressions. It's count how many tokens follow as tokens of format specifier. So the next
      * expression or string is not the next token, but the next token + token[4]
-     * 
+     *
      * @param node it's needed for raising syntax errors
      * @param values this part of text will be parsed
      * @param topLevel if there is called recursion on topLevel = false, then the syntax error is
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java
@@ -44,11 +44,12 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.ExplodeLoop.LoopExplosionKind;
 
 public class ImportFromNode extends AbstractImportNode {
     private final String importee;
     private final int level;
-    private final String[] fromlist;
+    @CompilationFinal(dimensions = 1) private final String[] fromlist;
     @Children private final WriteNode[] aslist;
     @Child private GetAttributeNode getName;
     @Child private GetItemNode getItem;
@@ -92,7 +93,7 @@ private Object readAttributeFromModule(VirtualFrame frame, Object module, String
     }
 
     @Override
-    @ExplodeLoop
+    @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     public void executeVoid(VirtualFrame frame) {
         Object globals = PArguments.getGlobals(frame);
         Object importedModule = importModule(frame, importee, globals, fromlist, level);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ overlay: "73db7dffa2266bb7e9f00fd8c6725480547b6365" }`
	`1`	`+{ overlay: "ce65e9108577ef31130e4646ea4e7df0368a6358" }`
Original file line number	Diff line number	Diff line change
`@@ -491,11 +491,11 @@ private void evalNonInteractive(Context context) throws IOException {`
`491`	`491`	`} catch (IOException e) {`
`492`	`492`	`}`
`493`	`493`	`File f = new File(inputFile);`
`494`		`- if (f.isFile() && (mimeType == null \|\| !mimeType.equals("application/zip"))) {`
`495`		`- src = Source.newBuilder(getLanguageId(), f).mimeType(MIME_TYPE).build();`
`496`		`- } else {`
	`494`	`+ if (f.isDirectory() \|\| (mimeType != null && mimeType.equals("application/zip"))) {`
`497`	`495`	`String runMod = String.format("import sys; sys.path.insert(0, '%s'); import runpy; runpy._run_module_as_main('__main__', False)", inputFile);`
`498`	`496`	`src = Source.newBuilder(getLanguageId(), runMod, "<string>").build();`
	`497`	`+ } else {`
	`498`	`+ src = Source.newBuilder(getLanguageId(), f).mimeType(MIME_TYPE).build();`
`499`	`499`	`}`
`500`	`500`	`}`
`501`	`501`	`context.eval(src);`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public abstract class NativeCAPISymbols {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL)`
	`106`	`+ @ExplodeLoop(kind = LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)`
`107`	`107`	`public static boolean isValid(String name) {`
`108`	`108`	`for (int i = 0; i < values.length; i++) {`
`109`	`109`	`if (values[i].equals(name)) {`