Merge branch 'origin/master' into release/graal-vm/1.0

Author: ansalond

.gitignore

@@ -56,3 +56,4 @@ Python3.g4.stamp
 /*.err
 /graalpython/include/*
 /graalpython/com.oracle.graal.python.test/src/tests/cpyext/As_FileDescriptor_Testfile
+/.*.csv*

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Python Changelog
+
+This changelog summarizes major changes between GraalVM versions of the Python
+language runtime. The main focus is on user-observable behavior of the engine.
+
+## Version 1.0.0 RC2
+
+* Updates to the polyglot and embedding APIs
+* Many additions to the language core implementation
+* Performance improvements to the parser
+* C-API improvements to compile and run simple C extensions
+* Support breakpoints on caught and uncaught exceptions in debugger
+
+## Version 1.0.0 RC1
+
+* LICENSE set to The Universal Permissive License (UPL), Version 1.0.

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "4c51f4dae2d670a4895aaafbe47780ac2541c008",
+  overlay: "2081dc054251c6658f7ce8f4b6671a474edbf2f6",
 
   // ======================================================================================================
   // 
@@ -23,7 +23,10 @@
     "2h": "2:00:00",
     "3h": "3:00:00",
     "4h": "4:00:00",
-    "10h": "10:00:00"
+    "8h": "8:00:00",
+    "10h": "10:00:00",
+    "16h": "16:00:00",
+    "20h": "20:00:00",
   },
   TIME_LIMIT: TIME_LIMIT,
 
@@ -142,6 +145,7 @@
       HOST_VM_CONFIG: "graal-core",
     },
   },
+  graalCoreMixin:  graalCoreMixin,
 
   local sulongMixin = labsjdk8Mixin + {
     environment +: {

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -107,11 +107,11 @@
 #include "pyfpe.h"
 #include "memoryobject.h"
 
-#undef Py_NoValue
-#define Py_NoValue truffle_invoke(PY_TRUFFLE_CEXT, "Py_NoValue")
+#define PY_TRUFFLE_CEXT ((void*)polyglot_import("python_cext"))
+#define PY_BUILTIN ((void*)polyglot_import("python_builtins"))
 
-#define PY_TRUFFLE_CEXT ((void*)truffle_import_cached("python_cext"))
-#define PY_BUILTIN ((void*)truffle_import_cached("python_builtins"))
+#undef Py_NoValue
+#define Py_NoValue UPCALL_CEXT_O("Py_NoValue")
 
 // TODO: we must extend the refcounting behavior to support handles to managed objects
 #undef Py_DECREF
@@ -179,7 +179,7 @@ extern int PyTruffle_Arg_ParseTupleAndKeywords(PyObject *argv, PyObject *kwds, c
 #ifdef PyArg_ParseTuple
 #undef PyArg_ParseTuple
 #endif
-#define PyArg_ParseTuple(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, (char*[]) { NULL }, ##__VA_ARGS__)
+#define PyArg_ParseTuple(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, NULL, ##__VA_ARGS__)
 
 #ifdef _PyArg_ParseTupleAndKeywordsFast
 #undef _PyArg_ParseTupleAndKeywordsFast
@@ -189,7 +189,7 @@ extern int PyTruffle_Arg_ParseTupleAndKeywords(PyObject *argv, PyObject *kwds, c
 #ifdef PyArg_Parse
 #undef PyArg_Parse
 #endif
-#define PyArg_Parse(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, (char*[]) { NULL }, __VA_ARGS__)
+#define PyArg_Parse(ARGV, FORMAT, ...) PyArg_ParseTupleAndKeywords(ARGV, PyDict_New(), FORMAT, NULL, __VA_ARGS__)
 
 extern PyObject * PyTruffle_Unicode_FromFormat(const char *fmt, int s, void* v0, void* v1, void* v2, void* v3, void* v4, void* v5, void* v6, void* v7, void* v8, void* v9, void* v10, void* v11, void* v12, void* v13, void* v14, void* v15, void* v16, void* v17, void* v18, void* v19);
 #define PyTruffle_Unicode_FromFormat_0(F1) PyTruffle_Unicode_FromFormat(F1, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)

graalpython/com.oracle.graal.python.cext/include/truffle.h

@@ -61,7 +61,7 @@ void *truffle_deref_handle_for_managed(void *managed);
 void *truffle_import(const char *name);        // renamed to polyglot_import
 void *truffle_import_cached(const char *name); // no replacement, use polyglot_import
 
-void *truffle_address_to_function(void *address); // deprecated, use a typecast to function pointer instead
+void *truffle_address_to_function(void *address); // deprecated, does nothing
 
 void *truffle_get_arg(int i); // renamed to polyglot_get_arg