[GR-34999] intrinsify exceptions.py

PullRequest: graalpython/2036

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_exception.py

@@ -154,7 +154,7 @@ def test_oserror_four_attribute(self):
         self.assertEqual(e.filename, "file1")
         self.assertEqual(e.filename2, None)
 
-    def test_oserror_four_attribute(self):
+    def test_oserror_four_attribute_2(self):
         e = OSError(errno.EISDIR, "message", "file1", None, "file2")
         self.assertEqual(e.errno, 21)
         self.assertEqual(e.strerror, "message")

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

@@ -39,6 +39,12 @@
 
     String doc() default "";
 
+    /**
+     * Most builtins are not OS specific. If specified, the builtin is included only if the os
+     * matches
+     */
+    PythonOS os() default PythonOS.PLATFORM_ANY;
+
     PythonBuiltinClassType constructsClass() default PythonBuiltinClassType.nil;
 
     PythonBuiltinClassType[] base() default {};

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

@@ -32,6 +32,12 @@
 public @interface CoreFunctions {
     String defineModule() default "";
 
+    /**
+     * Most builtins are not OS specific. If specified, the builtin is included only if the os
+     * matches
+     */
+    PythonOS os() default PythonOS.PLATFORM_ANY;
+
     String publicName() default "";
 
     PythonBuiltinClassType[] extendClasses() default {};

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

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IndentationError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TabError;
+import static com.oracle.graal.python.builtins.objects.exception.SyntaxErrorBuiltins.SYNTAX_ERROR_ATTR_FACTORY;
 import static com.oracle.graal.python.nodes.BuiltinNames.MODULES;
 import static com.oracle.graal.python.nodes.BuiltinNames.PRINT;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
@@ -45,7 +46,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.oracle.graal.python.builtins.objects.exception.SystemExitBuiltins;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -160,7 +160,6 @@
 import com.oracle.graal.python.builtins.modules.zlib.ZlibCompressBuiltins;
 import com.oracle.graal.python.builtins.modules.zlib.ZlibDecompressBuiltins;
 import com.oracle.graal.python.builtins.objects.NotImplementedBuiltins;
-import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.array.ArrayBuiltins;
 import com.oracle.graal.python.builtins.objects.bool.BoolBuiltins;
 import com.oracle.graal.python.builtins.objects.bytes.ByteArrayBuiltins;
@@ -180,7 +179,16 @@
 import com.oracle.graal.python.builtins.objects.ellipsis.EllipsisBuiltins;
 import com.oracle.graal.python.builtins.objects.enumerate.EnumerateBuiltins;
 import com.oracle.graal.python.builtins.objects.exception.BaseExceptionBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.ImportErrorBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.OsErrorBuiltins;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
+import com.oracle.graal.python.builtins.objects.exception.StopIterationBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.SyntaxErrorBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.SystemExitBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.UnicodeDecodeErrorBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.UnicodeEncodeErrorBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.UnicodeErrorBuiltins;
+import com.oracle.graal.python.builtins.objects.exception.UnicodeTranslateErrorBuiltins;
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins;
@@ -342,9 +350,11 @@ private static String[] initializeCoreFiles() {
         // add service loader defined python file extensions
         if (!ImageInfo.inImageRuntimeCode()) {
             ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
+            PythonOS currentOs = PythonOS.getPythonOS();
             for (PythonBuiltins builtin : providers) {
                 CoreFunctions annotation = builtin.getClass().getAnnotation(CoreFunctions.class);
-                if (!annotation.pythonFile().isEmpty()) {
+                if (!annotation.pythonFile().isEmpty() &&
+                                (annotation.os() == PythonOS.PLATFORM_ANY || annotation.os() == currentOs)) {
                     coreFiles.add(annotation.pythonFile());
                 }
             }
@@ -374,6 +384,16 @@ private static String[] initializeCoreFiles() {
         c = null;
     }
 
+    private static void filterBuiltins(List<PythonBuiltins> builtins) {
+        PythonOS currentOs = PythonOS.getPythonOS();
+        for (PythonBuiltins builtin : builtins) {
+            CoreFunctions annotation = builtin.getClass().getAnnotation(CoreFunctions.class);
+            if (annotation.os() != PythonOS.PLATFORM_ANY && annotation.os() != currentOs) {
+                builtins.remove(builtin);
+            }
+        }
+    }
+
     private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed) {
         List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(
                         new BuiltinConstructors(),
@@ -452,6 +472,14 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                         new WarningsModuleBuiltins(),
                         // exceptions
                         new SystemExitBuiltins(),
+                        new ImportErrorBuiltins(),
+                        new StopIterationBuiltins(),
+                        new SyntaxErrorBuiltins(),
+                        new OsErrorBuiltins(),
+                        new UnicodeErrorBuiltins(),
+                        new UnicodeEncodeErrorBuiltins(),
+                        new UnicodeDecodeErrorBuiltins(),
+                        new UnicodeTranslateErrorBuiltins(),
 
                         // io
                         new IOModuleBuiltins(),
@@ -625,6 +653,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                 builtins.add(builtin);
             }
         }
+        filterBuiltins(builtins);
         return builtins.toArray(new PythonBuiltins[builtins.size()]);
     }
 
@@ -762,7 +791,7 @@ public final void postInitialize() {
 
             for (PythonBuiltins builtin : builtins) {
                 CoreFunctions annotation = builtin.getClass().getAnnotation(CoreFunctions.class);
-                if (annotation.isEager()) {
+                if (annotation.isEager() || annotation.extendClasses().length != 0) {
                     builtin.postInitialize(this);
                 }
             }
@@ -792,6 +821,11 @@ public final PythonModule getBuiltins() {
         return builtinsModule;
     }
 
+    public final void registerTypeInBuiltins(String name, PythonBuiltinClassType type) {
+        assert builtinsModule != null : "builtins module was not yet initialized: cannot register type";
+        builtinsModule.setAttribute(name, lookupType(type));
+    }
+
     public final PythonModule getSysModule() {
         return sysModule;
     }
@@ -1056,16 +1090,13 @@ public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, No
                 break;
         }
         instance = factory().createBaseException(cls, message, arguments);
+        final Object[] excAttrs = SYNTAX_ERROR_ATTR_FACTORY.create();
         SourceSection section = location.getSourceSection();
         Source source = section.getSource();
         String path = source.getPath();
-        instance.setAttribute("filename", path != null ? path : source.getName() != null ? source.getName() : "<string>");
-        // Not very nice. This counts on the implementation in traceback.py where if the value of
-        // text attribute
-        // is NONE, then the line is not printed
-        instance.setAttribute("text", section.isAvailable() ? source.getCharacters(section.getStartLine()) : PNone.NONE);
-        instance.setAttribute("lineno", section.getStartLine());
-        instance.setAttribute("offset", section.getStartColumn());
+        excAttrs[SyntaxErrorBuiltins.IDX_FILENAME] = (path != null) ? path : source.getName() != null ? source.getName() : "<string>";
+        excAttrs[SyntaxErrorBuiltins.IDX_LINENO] = section.getStartLine();
+        excAttrs[SyntaxErrorBuiltins.IDX_OFFSET] = section.getStartColumn();
         String msg = "invalid syntax";
         if (type == PythonParser.ErrorType.Print) {
             CharSequence line = source.getCharacters(section.getStartLine());
@@ -1086,7 +1117,12 @@ public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, No
         } else if (message != null) {
             msg = (new ErrorMessageFormatter()).format(message, arguments);
         }
-        instance.setAttribute("msg", msg);
+        // Not very nice. This counts on the implementation in traceback.py where if the value of
+        // text attribute is NONE, then the line is not printed
+        final String text = section.isAvailable() ? source.getCharacters(section.getStartLine()).toString() : null;
+        excAttrs[SyntaxErrorBuiltins.IDX_MSG] = msg;
+        excAttrs[SyntaxErrorBuiltins.IDX_TEXT] = text;
+        instance.setExceptionAttributes(excAttrs);
         throw PException.fromObject(instance, location, PythonOptions.isPExceptionWithJavaStacktrace(getLanguage()));
     }
 

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

@@ -104,7 +104,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
     PDictValueIterator(DICT_VALUEITERATOR, Flags.PRIVATE_DERIVED_WODICT),
     PDictReverseValueIterator(DICT_REVERSE_VALUEITERATOR, Flags.PRIVATE_DERIVED_WODICT),
     PDictValuesView(DICT_VALUES, Flags.PRIVATE_DERIVED_WODICT),
-    PEllipsis("ellipsis", Flags.PRIVATE_DERIVED_WODICT),
+    PEllipsis("ellipsis", BUILTINS, Flags.PRIVATE_DERIVED_WODICT),
     PEnumerate("enumerate", BUILTINS),
     PMap("map", BUILTINS),
     PFloat("float", BUILTINS),

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

@@ -130,15 +130,18 @@ public void postInitialize(@SuppressWarnings("unused") Python3Core core) {
     private void initializeEachFactoryWith(BiConsumer<NodeFactory<? extends PythonBuiltinBaseNode>, Builtin> func) {
         List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> factories = getNodeFactories();
         assert factories != null : "No factories found. Override getFactories() to resolve this.";
+        PythonOS currentOs = PythonOS.getPythonOS();
         for (NodeFactory<? extends PythonBuiltinBaseNode> factory : factories) {
             Boolean needsFrame = null;
             for (Builtin builtin : factory.getNodeClass().getAnnotationsByType(Builtin.class)) {
-                if (needsFrame == null) {
-                    needsFrame = builtin.needsFrame();
-                } else if (needsFrame != builtin.needsFrame()) {
-                    throw new IllegalStateException(String.format("Implementation error in %s: all @Builtin annotations must agree if the node needs a frame.", factory.getNodeClass().getName()));
+                if (builtin.os() == PythonOS.PLATFORM_ANY || builtin.os() == currentOs) {
+                    if (needsFrame == null) {
+                        needsFrame = builtin.needsFrame();
+                    } else if (needsFrame != builtin.needsFrame()) {
+                        throw new IllegalStateException(String.format("Implementation error in %s: all @Builtin annotations must agree if the node needs a frame.", factory.getNodeClass().getName()));
+                    }
+                    func.accept(factory, builtin);
                 }
-                func.accept(factory, builtin);
             }
         }
     }

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

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins;
+
+import com.oracle.truffle.api.CompilerDirectives;
+
+public enum PythonOS {
+    PLATFORM_JAVA("java"),
+    PLATFORM_CYGWIN("cygwin"),
+    PLATFORM_LINUX("linux"),
+    PLATFORM_DARWIN("darwin"),
+    PLATFORM_WIN32("win32"),
+    PLATFORM_SUNOS("sunos"),
+    PLATFORM_FREEBSD("freebsd"),
+    PLATFORM_ANY(null);
+
+    private final String name;
+
+    PythonOS(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @CompilerDirectives.TruffleBoundary
+    public static PythonOS getPythonOS() {
+        String property = System.getProperty("os.name");
+        PythonOS os = PLATFORM_JAVA;
+        if (property != null) {
+            if (property.toLowerCase().contains("cygwin")) {
+                os = PLATFORM_CYGWIN;
+            } else if (property.toLowerCase().contains("linux")) {
+                os = PLATFORM_LINUX;
+            } else if (property.toLowerCase().contains("mac")) {
+                os = PLATFORM_DARWIN;
+            } else if (property.toLowerCase().contains("windows")) {
+                os = PLATFORM_WIN32;
+            } else if (property.toLowerCase().contains("sunos")) {
+                os = PLATFORM_SUNOS;
+            } else if (property.toLowerCase().contains("freebsd")) {
+                os = PLATFORM_FREEBSD;
+            }
+        }
+        return os;
+    }
+}

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

@@ -27,7 +27,7 @@
 
 import static com.oracle.graal.python.nodes.ErrorMessages.S_TAKES_AT_LEAST_D_ARGUMENTS_D_GIVEN;
 import static com.oracle.graal.python.nodes.ErrorMessages.S_TAKES_AT_MOST_D_ARGUMENTS_D_GIVEN;
-import static com.oracle.graal.python.nodes.ErrorMessages.TAKES_NO_KEYWORD_ARGS;
+import static com.oracle.graal.python.nodes.ErrorMessages.S_TAKES_NO_KEYWORD_ARGS;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
@@ -138,7 +138,7 @@ Object error(Object cls, Object[] args, PKeyword[] kwargs) {
         private void checkKwargs(Object cls, PKeyword[] kwargs, IsBuiltinClassProfile isNotSubtypeProfile) {
             if (isNotSubtypeProfile.profileClass(cls, PythonBuiltinClassType.PArray)) {
                 if (kwargs.length != 0) {
-                    throw raise(TypeError, TAKES_NO_KEYWORD_ARGS, "array.array()");
+                    throw raise(TypeError, S_TAKES_NO_KEYWORD_ARGS, "array.array()");
                 }
             }
         }