[GR-40178] Fix and re-enable HPy tests.

PullRequest: graalpython/2428

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/context.c

@@ -39,19 +39,37 @@
  * SOFTWARE.
  */
 
-#include "Python.h"
+#include "capi.h"
 
+UPCALL_ID(PyContextVar_New);
+PyObject *
+PyContextVar_New(const char *name, PyObject *def)
+{
+    if (name == NULL) {
+        return NULL;
+    }
+    return UPCALL_CEXT_O(_jls_PyContextVar_New, polyglot_from_string(name, SRC_CS), native_to_java(def));
+}
+
+typedef PyObject *(*contextvar_get_fun_t)(PyObject *, PyObject *, void *);
+UPCALL_TYPED_ID(PyContextVar_Get, contextvar_get_fun_t);
 int
 PyContextVar_Get(PyObject *var, PyObject *default_value, PyObject **value)
 {
-    PyErr_SetString(PyExc_SystemError, "PyContextVar_Get not implemented");
-    return -1;
+    static void *error_marker = &marker_struct;
+    PyObject *res = _jls_PyContextVar_Get(native_to_java(var), native_to_java(default_value), error_marker);
+    if ((void *)res == error_marker) {
+        *value = NULL;
+        return -1;
+    }
+    *value = res;
+    return 0;
 }
 
+UPCALL_ID(PyContextVar_Set);
 PyObject *
 PyContextVar_Set(PyObject *var, PyObject *value)
 {
-    PyErr_SetString(PyExc_SystemError, "PyContextVar_Set not implemented");
-    return NULL;
+    return UPCALL_CEXT_O(_jls_PyContextVar_Set, native_to_java(var), native_to_java(value));
 }
 

graalpython/com.oracle.graal.python.cext/src/errors.c

@@ -212,6 +212,16 @@ PyObject* PyErr_SetFromErrno(PyObject* exc) {
     return PyErr_SetFromErrnoWithFilenameObjects(exc, NULL, NULL);
 }
 
+// taken from CPython "Python/errors.c"
+PyObject *
+PyErr_SetFromErrnoWithFilename(PyObject *exc, const char *filename)
+{
+    PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL;
+    PyObject *result = PyErr_SetFromErrnoWithFilenameObjects(exc, name, NULL);
+    Py_XDECREF(name);
+    return result;
+}
+
 // taken from CPython "Python/errors.c"
 PyObject* PyErr_SetFromErrnoWithFilenameObject(PyObject* exc, PyObject* filenameObject) {
     return PyErr_SetFromErrnoWithFilenameObjects(exc, filenameObject, NULL);

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -488,7 +488,7 @@ PyObject * PyUnicode_FromWideChar(const wchar_t *u, Py_ssize_t size) {
 
 static PyObject* _PyUnicode_FromUCS1(const Py_UCS1* u, Py_ssize_t size) {
 	// CPython assumes latin1 when decoding an UCS1 array
-	return polyglot_from_string((const char *) u, "ISO-8859-1");
+	return to_sulong(polyglot_from_string((const char *) u, "ISO-8859-1"));
 }
 
 static PyObject* _PyUnicode_FromUCS2(const Py_UCS2 *u, Py_ssize_t size) {
@@ -690,3 +690,14 @@ UPCALL_ID(PyUnicode_Split)
 PyObject* PyUnicode_Split(PyObject *s, PyObject *sep, Py_ssize_t maxsplit) {
     return UPCALL_CEXT_O(_jls_PyUnicode_Split, native_to_java(s), native_to_java(sep), maxsplit);
 }
+
+// taken from CPython "Objects/unicodeobject.c"
+PyObject *
+PyUnicode_DecodeLatin1(const char *s,
+                       Py_ssize_t size,
+                       const char *errors)
+{
+    /* Latin-1 is equivalent to the first 256 ordinals in Unicode. */
+    return _PyUnicode_FromUCS1((const unsigned char*)s, size);
+}
+

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

@@ -131,6 +131,7 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextClassBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextCodeBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextComplexBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextContextBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextDescrBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextDictBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextErrBuiltins;
@@ -528,6 +529,7 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
                         new PythonCextCEvalBuiltins(),
                         new PythonCextCodeBuiltins(),
                         new PythonCextComplexBuiltins(),
+                        new PythonCextContextBuiltins(),
                         new PythonCextClassBuiltins(),
                         new PythonCextDescrBuiltins(),
                         new PythonCextDictBuiltins(),

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

@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2022, 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.modules.cext;
+
+import java.util.List;
+
+import com.oracle.graal.python.builtins.Builtin;
+import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
+import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToNewRefNode;
+import com.oracle.graal.python.builtins.objects.contextvars.PContextVar;
+import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.call.CallNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
+import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.strings.TruffleString;
+
+@CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
+@GenerateNodeFactory
+public final class PythonCextContextBuiltins extends PythonBuiltins {
+
+    @Override
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return PythonCextContextBuiltinsFactory.getFactories();
+    }
+
+    @Builtin(name = "PyContextVar_New", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class PyContextVarNewNode extends PythonBuiltinNode {
+        @Specialization
+        static Object doGeneric(VirtualFrame frame, TruffleString name, Object def,
+                        @Cached CallNode callContextvar) {
+            return callContextvar.execute(frame, PythonBuiltinClassType.ContextVar, name, def);
+        }
+    }
+
+    // directly called without landing function
+    @Builtin(name = "PyContextVar_Get", minNumOfPositionalArgs = 3)
+    @GenerateNodeFactory
+    public abstract static class PyContextVarGetNode extends PythonBuiltinNode {
+        @Specialization
+        Object doGeneric(VirtualFrame frame, Object varObj, Object defObj, Object marker,
+                        @Cached AsPythonObjectNode asPythonObjectNode,
+                        @Cached ToNewRefNode toNewRefNode,
+                        @Cached PRaiseNativeNode raiseNode) {
+            Object var = asPythonObjectNode.execute(varObj);
+            Object def = asPythonObjectNode.execute(defObj);
+            if (!(var instanceof PContextVar)) {
+                return raiseNode.raise(frame, marker, PythonBuiltinClassType.TypeError, ErrorMessages.INSTANCE_OF_CONTEXTVAR_EXPECTED);
+            }
+            PythonContext.PythonThreadState threadState = getContext().getThreadState(getLanguage());
+            Object result = ((PContextVar) var).getValue(threadState);
+            if (result == null) {
+                if (def == PNone.NO_VALUE) {
+                    def = ((PContextVar) var).getDefault();
+                    if (def == PContextVar.NO_DEFAULT) {
+                        def = PNone.NO_VALUE;
+                    }
+                }
+                result = def;
+            }
+            return toNewRefNode.execute(result);
+        }
+    }
+
+    @Builtin(name = "PyContextVar_Set", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class PyContextVarSetNode extends PythonBuiltinNode {
+        @Specialization
+        Object doGeneric(VirtualFrame frame, Object var, Object val,
+                        @Cached PRaiseNativeNode raiseNode) {
+            if (!(var instanceof PContextVar)) {
+                return raiseNode.raise(frame, getContext().getNativeNull(), PythonBuiltinClassType.TypeError, ErrorMessages.INSTANCE_OF_CONTEXTVAR_EXPECTED);
+            }
+            PythonContext.PythonThreadState threadState = getContext().getThreadState(getLanguage());
+            PContextVar pvar = (PContextVar) var;
+            Object oldValue = pvar.getValue(threadState);
+            pvar.setValue(threadState, val);
+            return factory().createContextVarsToken(pvar, oldValue);
+        }
+    }
+}

graalpython/lib-graalpython/modules/hpy/test/test_hpycontextvar.py

@@ -26,7 +26,6 @@
 
 
 class TestContextVar(HPyTest):
-    @pytest.mark.skip(reason="GR-40178")
     def test_ContextVar_basics(self):
         mod = self.make_module("""
             HPyDef_METH(create_ctxvar, "create_ctxvar", create_ctxvar_impl, HPyFunc_O)

graalpython/lib-graalpython/modules/hpy/test/test_hpyerr.py

@@ -170,7 +170,6 @@ def test_HPyErr_SetFromErrno(self):
 
             assert err.value.errno == errno.EINVAL
 
-    @pytest.mark.skip(reason="GR-40178")
     def test_HPyErr_SetFromErrnoWithFilenameObjects(self):
         import pytest
         import errno
@@ -208,7 +207,6 @@ def test_HPyErr_SetFromErrnoWithFilenameObjects(self):
         assert err.value.filename == file1
         assert err.value.filename2 == file2
 
-    @pytest.mark.skip(reason="GR-40178")
     def test_HPyErr_SetFromErrnoWithFilename(self):
         import pytest
         import errno

graalpython/lib-graalpython/modules/hpy/test/test_hpyunicode.py

@@ -163,7 +163,6 @@ def test_AsUTF8AndSize(self):
         assert mod.g(b'A'.decode('utf-8')) == ord('A')
         assert mod.g(b'A\0'.decode('utf-8')) == ord('A')
 
-    @pytest.mark.skip(reason="GR-40178")
     def test_DecodeLatin1(self):
         mod = self.make_module("""
             HPyDef_METH(f, "f", f_impl, HPyFunc_O)