[GR-23254] Various fixes for test_raise

PullRequest: graalpython/981

Author: msimacek

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

@@ -47,6 +47,8 @@
 
     boolean isSetter() default false;
 
+    boolean allowsDelete() default false;
+
     boolean takesVarArgs() default false;
 
     boolean varArgsMarker() default false;

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

@@ -93,7 +93,7 @@ public void initialize(PythonCore core) {
                     assert !builtin.isClassmethod() && !builtin.isStaticmethod();
                     PBuiltinFunction get = builtin.isGetter() ? function : null;
                     PBuiltinFunction set = builtin.isSetter() ? function : null;
-                    callable = core.factory().createGetSetDescriptor(get, set, builtin.name(), null);
+                    callable = core.factory().createGetSetDescriptor(get, set, builtin.name(), null, builtin.allowsDelete());
                 } else if (builtin.isClassmethod()) {
                     assert !builtin.isStaticmethod();
                     callable = core.factory().createClassmethod(function);

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

@@ -136,6 +136,7 @@
 import com.oracle.graal.python.builtins.objects.set.SetNodes;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.superobject.SuperObject;
+import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
@@ -189,6 +190,7 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ObjectSequenceStorage;
@@ -2827,12 +2829,40 @@ Object call() {
         }
     }
 
-    @Builtin(name = "traceback", constructsClass = PythonBuiltinClassType.PTraceback, isPublic = false)
+    @Builtin(name = "TracebackType", constructsClass = PythonBuiltinClassType.PTraceback, isPublic = false, minNumOfPositionalArgs = 5, parameterNames = {"$cls", "tb_next", "tb_frame", "tb_lasti",
+                    "tb_lineno"})
     @GenerateNodeFactory
     public abstract static class TracebackTypeNode extends PythonBuiltinNode {
-        @Specialization
-        Object call() {
-            throw raise(RuntimeError, ErrorMessages.CANNOT_CALL_CTOR_OF, "traceback type");
+        @Specialization(limit = "1")
+        Object createTraceback(@SuppressWarnings("unused") LazyPythonClass cls, PTraceback next, PFrame frame, Object lasti, Object lineno,
+                        @CachedLibrary("lasti") PythonObjectLibrary lastiLib,
+                        @CachedLibrary("lineno") PythonObjectLibrary linenoLib,
+                        @Cached PythonObjectFactory factory) {
+            return factory.createTraceback(frame, linenoLib.asSize(lineno), lastiLib.asSize(lasti), next);
+        }
+
+        @Specialization(limit = "1")
+        Object createTraceback(@SuppressWarnings("unused") LazyPythonClass cls, @SuppressWarnings("unused") PNone next, PFrame frame, Object lasti, Object lineno,
+                        @CachedLibrary("lasti") PythonObjectLibrary lastiLib,
+                        @CachedLibrary("lineno") PythonObjectLibrary linenoLib,
+                        @Cached PythonObjectFactory factory) {
+            return factory.createTraceback(frame, linenoLib.asSize(lineno), lastiLib.asSize(lasti), null);
+        }
+
+        @Specialization(guards = {"!isPTraceback(next)", "!isNone(next)"})
+        @SuppressWarnings("unused")
+        Object errorNext(LazyPythonClass cls, Object next, Object frame, Object lasti, Object lineno) {
+            throw raise(TypeError, "expected traceback object or None, got '%p'", next);
+        }
+
+        @Specialization(guards = "!isPFrame(frame)")
+        @SuppressWarnings("unused")
+        Object errorFrame(LazyPythonClass cls, Object next, Object frame, Object lasti, Object lineno) {
+            throw raise(TypeError, "TracebackType() argument 'tb_frame' must be frame, not %p", frame);
+        }
+
+        protected static boolean isPFrame(Object obj) {
+            return obj instanceof PFrame;
         }
     }
 

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

@@ -1653,7 +1653,7 @@ PThreadState get() {
     public abstract static class GetSetDescriptorNode extends PythonBuiltinNode {
         @Specialization(guards = {"!isNoValue(get)", "!isNoValue(set)"})
         Object call(Object get, Object set, String name, LazyPythonClass owner) {
-            return factory().createGetSetDescriptor(get, set, name, owner);
+            return factory().createGetSetDescriptor(get, set, name, owner, true);
         }
 
         @Specialization(guards = {"!isNoValue(get)", "isNoValue(set)"})
@@ -1663,7 +1663,7 @@ Object call(Object get, @SuppressWarnings("unused") PNone set, String name, Lazy
 
         @Specialization(guards = {"isNoValue(get)", "!isNoValue(set)"})
         Object call(@SuppressWarnings("unused") PNone get, Object set, String name, LazyPythonClass owner) {
-            return factory().createGetSetDescriptor(null, set, name, owner);
+            return factory().createGetSetDescriptor(null, set, name, owner, true);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -90,6 +90,7 @@
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.builtins.objects.getsetdescriptor.DescriptorDeleteMarker;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
@@ -412,6 +413,14 @@ static Object doNativeNull(@SuppressWarnings("unused") CExtContext cextContext,
             return object.getPtr();
         }
 
+        @Specialization
+        static Object doDeleteMarker(@SuppressWarnings("unused") CExtContext cextContext, DescriptorDeleteMarker marker,
+                        @Cached GetNativeNullNode getNativeNullNode) {
+            assert marker == DescriptorDeleteMarker.INSTANCE;
+            PythonNativeNull nativeNull = (PythonNativeNull) getNativeNullNode.execute();
+            return nativeNull.getPtr();
+        }
+
         @Specialization(guards = {"object == cachedObject", "isSpecialSingleton(cachedObject)"})
         static Object doSingletonCached(CExtContext cextContext, @SuppressWarnings("unused") PythonAbstractObject object,
                         @Cached("object") PythonAbstractObject cachedObject,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/DescriptorDeleteMarker.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020, 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.objects.getsetdescriptor;
+
+public class DescriptorDeleteMarker {
+    public static final DescriptorDeleteMarker INSTANCE = new DescriptorDeleteMarker();
+
+    private DescriptorDeleteMarker() {
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptor.java

@@ -50,14 +50,20 @@ public final class GetSetDescriptor extends PythonBuiltinObject implements Bound
     private final Object get;
     private final Object set;
     private final String name;
+    private final boolean allowsDelete;
     private final LazyPythonClass type;
 
     public GetSetDescriptor(Object get, Object set, String name, LazyPythonClass type) {
+        this(get, set, name, type, false);
+    }
+
+    public GetSetDescriptor(Object get, Object set, String name, LazyPythonClass type, boolean allowsDelete) {
         super(PythonBuiltinClassType.GetSetDescriptor, PythonBuiltinClassType.GetSetDescriptor.newInstance());
         this.get = get;
         this.set = set;
         this.name = name;
         this.type = type;
+        this.allowsDelete = allowsDelete;
     }
 
     public Object getGet() {
@@ -76,6 +82,10 @@ public LazyPythonClass getType() {
         return type;
     }
 
+    public boolean allowsDelete() {
+        return allowsDelete;
+    }
+
     public GetSetDescriptor boundToObject(PythonBuiltinClassType klass, PythonObjectFactory factory) {
         if (klass == type) {
             return this;