Merge remote-tracking branch 'origin/fa/numpy-building' into tim/numpy-building

Author: timfel

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

@@ -52,7 +52,7 @@ long PyLong_AsLongAndOverflow(PyObject *obj, int *overflow) {
         return -1;
     }
     long result = truffle_invoke_l(PY_TRUFFLE_CEXT, "PyLong_AsPrimitive", to_java(obj), true, sizeof(long), truffle_read_string("long"));
-    *overflow = result == -1L && PyErr_Occurred();
+    *overflow = result == -1L && PyErr_Occurred() != NULL;
     return result;
 }
 
@@ -93,8 +93,13 @@ PyObject * PyLong_FromVoidPtr(void *p) {
 void * PyLong_AsVoidPtr(PyObject *obj){
 	return (void *)PyLong_AsSsize_t(obj);
 }
+
 PyObject * PyLong_FromLong(long n)  {
-	return PyLong_FromUnsignedLongLong(n);
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, true);
+    if (result == ERROR_MARKER) {
+    	return NULL;
+    }
+    return to_sulong(result);
 }
 
 PyObject * PyLong_FromLongLong(long long n)  {

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_capsule.py

@@ -56,7 +56,7 @@ def compile_module(self, name):
         ''',
         resultspec="i",
         argspec='sn',
-        arguments=["PyObject* name", "Py_ssize_t ptr"],
+        arguments=["char* name", "Py_ssize_t ptr"],
         callfunction="wrap_PyCapsule_Check",
         cmpfunc=unhandled_error_compare
     )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -83,6 +83,7 @@ public Object clear(PFrame self, int idx) {
     @GenerateNodeFactory
     public abstract static class TruffleGetClassScopeNode extends PythonBuiltinNode {
         @Specialization
+        @TruffleBoundary
         public Object add(PFrame self) {
             // TODO: remove me
             // TODO: do it properly via the python API in super.__init__ :