Merge branch 'master'

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "6d065be2f57c39d4637e1091d7c89d3afde6827c" }
+{ "overlay": "3c6f644a6a6c7d27bae5b0d82445818549a83175" }

graalpython/com.oracle.graal.python.benchmarks/java/com/oracle/graal/python/benchmarks/parser/ParserBenchRunner.java

@@ -46,7 +46,7 @@
 import com.oracle.graal.python.parser.PythonParserImpl;
 import com.oracle.graal.python.parser.PythonSSTNodeFactory;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.source.Source;
@@ -98,7 +98,7 @@ public class ParserBenchRunner {
 
     protected final PythonContext pyContext;
     protected final PythonParserImpl parser;
-    protected final PythonCore core;
+    protected final Python3Core core;
     private List<Source> sources;
 
     public ParserBenchRunner() {

graalpython/com.oracle.graal.python.cext/include/cpython/abstract.h

@@ -155,7 +155,7 @@ _PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs)
 /* Call a callable without any arguments */
 static inline PyObject *
 _PyObject_CallNoArg(PyObject *func) {
-    return _PyObject_Vectorcall(func, NULL, 0, NULL);
+    return PyObject_CallObject(func, NULL); /* Truffle change: redirect to PyObject_CallObject until _PyObject_Vectorcall is implemented */
 }
 
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(

graalpython/com.oracle.graal.python.cext/setup.py

@@ -58,13 +58,14 @@
 libhpy_name = "libhpy"
 libposix_name = "libposix"
 
+MACOS = sys.platform == "darwin"
 verbosity = '--verbose' if sys.flags.verbose else '--quiet'
-darwin_native = sys.platform == "darwin" and __graalpython__.platform_id == "native"
+darwin_native = MACOS and __graalpython__.platform_id == "native"
 relative_rpath = "@loader_path" if darwin_native else r"$ORIGIN"
 so_ext = get_config_var("EXT_SUFFIX")
 SOABI = get_config_var("SOABI")
 is_managed = 'managed' in SOABI
-lib_ext = 'dylib' if sys.platform == "darwin" else 'so'
+lib_ext = 'dylib' if MACOS else 'so'
 
 # configure logger
 logger = logging.getLogger(__name__)
@@ -361,6 +362,8 @@ def __init__(self, name, subdir="modules", files=None, deps=[], **kwargs):
         # common case: just a single file which is the module's name plus the file extension
         if not files:
             self.files = [name + ".c"]
+        else:
+            self.files = files
         self.kwargs = kwargs
 
     def __call__(self):

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

@@ -67,6 +67,16 @@ PyObject* PyDict_GetItemWithError(PyObject* d, PyObject* k) {
     return UPCALL_CEXT_BORROWED(_jls_PyDict_GetItemWithError, native_to_java(d), native_to_java(k));
 }
 
+PyObject *
+_PyDict_GetItemIdWithError(PyObject *dp, struct _Py_Identifier *key)
+{
+    PyObject *kv;
+    kv = _PyUnicode_FromId(key); /* borrowed */
+    if (kv == NULL)
+        return NULL;
+    return PyDict_GetItemWithError(dp, kv);
+}
+
 PyObject* _PyDict_GetItemId(PyObject* d, _Py_Identifier* id) {
     return PyDict_GetItemString(d, id->string);
 }

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

@@ -433,6 +433,68 @@ PyObject * PyObject_GetAttr(PyObject *v, PyObject *name) {
     return NULL;
 }
 
+// taken from CPython "Objects/object.c"
+int _PyObject_LookupAttr(PyObject *v, PyObject *name, PyObject **result)
+{
+    PyTypeObject *tp = Py_TYPE(v);
+
+    if (!PyUnicode_Check(name)) {
+        PyErr_Format(PyExc_TypeError,
+                     "attribute name must be string, not '%.200s'",
+                     name->ob_type->tp_name);
+        *result = NULL;
+        return -1;
+    }
+
+    /* Truffle change: this fast path is only applicable to cpython
+    if (tp->tp_getattro == PyObject_GenericGetAttr) {
+        *result = _PyObject_GenericGetAttrWithDict(v, name, NULL, 1);
+        if (*result != NULL) {
+            return 1;
+        }
+        if (PyErr_Occurred()) {
+            return -1;
+        }
+        return 0;
+    }
+    */
+    if (tp->tp_getattro != NULL) {
+        *result = (*tp->tp_getattro)(v, name);
+    }
+    else if (tp->tp_getattr != NULL) {
+        const char *name_str = PyUnicode_AsUTF8(name);
+        if (name_str == NULL) {
+            *result = NULL;
+            return -1;
+        }
+        *result = (*tp->tp_getattr)(v, (char *)name_str);
+    }
+    else {
+        *result = NULL;
+        return 0;
+    }
+
+    if (*result != NULL) {
+        return 1;
+    }
+    if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+        return -1;
+    }
+    PyErr_Clear();
+    return 0;
+}
+
+// taken from CPython "Objects/object.c"
+int _PyObject_LookupAttrId(PyObject *v, _Py_Identifier *name, PyObject **result)
+{
+    PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
+    if (!oname) {
+        *result = NULL;
+        return -1;
+    }
+    return  _PyObject_LookupAttr(v, oname, result);
+}
+
 UPCALL_ID(PyObject_GenericGetAttr);
 PyObject* PyObject_GenericGetAttr(PyObject* obj, PyObject* attr) {
     PyTypeObject *tp = Py_TYPE(obj);
@@ -486,6 +548,17 @@ int PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value) {
     return -1;
 }
 
+// taken from CPython "Objects/object.c"
+int _PyObject_SetAttrId(PyObject *v, _Py_Identifier *name, PyObject *w)
+{
+    int result;
+    PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
+    if (!oname)
+        return -1;
+    result = PyObject_SetAttr(v, oname, w);
+    return result;
+}
+
 UPCALL_ID(PyObject_GenericSetAttr);
 int PyObject_GenericSetAttr(PyObject* obj, PyObject* attr, PyObject* value) {
     PyTypeObject *tp = Py_TYPE(obj);

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

@@ -486,8 +486,8 @@ int PyType_Ready(PyTypeObject* cls) {
         } else {
             bases = PyTuple_Pack(1, base);
         }
+        cls->tp_bases = bases;
     }
-    cls->tp_bases = bases;
 
     /* Initialize tp_dict */
     PyObject* dict = cls->tp_dict;

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -143,9 +143,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     inspectFlag = true;
                     break;
                 case "-m":
-                    if (i + 1 < arguments.size()) {
-                        // don't increment i here so that we capture the correct args
-                        String module = arguments.get(i + 1);
+                    programArgs.add(arg);
+                    i++;
+                    if (i < arguments.size()) {
+                        String module = arguments.get(i);
                         commandString = "import runpy; runpy._run_module_as_main('" + module + "')";
                     } else {
                         print("Argument expected for the -m option");

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/CustomModule.java

@@ -46,7 +46,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
-import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.truffle.api.dsl.NodeFactory;
 
 @CoreFunctions(defineModule = "CustomModule")
@@ -58,7 +58,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     }
 
     @Override
-    public void initialize(PythonCore core) {
+    public void initialize(Python3Core core) {
         super.initialize(core);
         this.builtinConstants.put("success", "success");
     }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/GeneratorAndCompForTests.java

@@ -349,4 +349,29 @@ public void dictCompr() throws Exception {
     public void genExpr() throws Exception {
         checkScopeAndTree("(i for i in range(3))");
     }
+
+    @Test
+    public void genExpr01() throws Exception {
+        checkScopeAndTree("[ (c,s) for c in ('a','b') for s in (1,2,3,4,5)]");
+    }
+
+    @Test
+    public void genExpr02() throws Exception {
+        checkScopeAndTree("[ (s,c) for c in ('a','b') for s in (1,2,3,4,5)]");
+    }
+
+    @Test
+    public void genExpr03() throws Exception {
+        checkScopeAndTree("(e+1 for e in (i*2 for i in (1,2,3)))");
+    }
+
+    @Test
+    public void issueGitHub_42_v1() throws Exception {
+        checkScopeAndTree("[e for e in (s for s in (1, 2, 3))]");
+    }
+
+    @Test
+    public void issueGitHub_42_v2() throws Exception {
+        checkScopeAndTree("[e for e in [s for s in (1, 2, 3)]]");
+    }
 }