Replace error marker by native NULL.

fangerer · fangerer · commit 0ff8b43aef93 · 2018-09-05T14:31:17.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -168,6 +168,9 @@ static void initialize_globals() {
     // error marker
     void *jerrormarker = UPCALL_CEXT_PTR(polyglot_from_string("Py_ErrorHandler", SRC_CS));
     truffle_assign_managed(&marker_struct, jerrormarker);
+
+    // register native NULL
+    polyglot_invoke(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Register_NULL", SRC_CS), NULL);
 }
 
 static void initialize_bufferprocs() {
@@ -187,7 +190,7 @@ static void initialize_capi() {
 
 __attribute__((always_inline))
 inline void* handle_exception(void* val) {
-    return val == ERROR_MARKER ? NULL : val;
+    return val;
 }
 
 // Heuristic to test if some value is a pointer object
diff --git a/graalpython/lib-graalpython/python_cext.py b/graalpython/lib-graalpython/python_cext.py
@@ -41,8 +41,9 @@
 import sys
 import python_cext
 
+native_null = None
 
-def may_raise(error_result=error_handler):
+def may_raise(error_result=native_null):
     if isinstance(error_result, type(may_raise)):
         # direct annotation
         return may_raise(error_handler)(error_result)
@@ -52,6 +53,11 @@ def decorator(fun):
         return decorator
 
 
+def PyTruffle_Register_NULL(object):
+    global native_null
+    native_null = object
+
+
 def Py_ErrorHandler():
     return to_sulong(error_handler)
 
diff --git a/mx.graalpython/mx_graalpython_bench_param.py b/mx.graalpython/mx_graalpython_bench_param.py
@@ -90,6 +90,7 @@
     'special-len': ITER_10 + ['5'],
     'member_access': ITER_10 + ['5'],
     'c_member_access': ITER_25 + ['5'],
+    'cpyext/c-list-iterating-obj': ITER_15 + ['10000000']
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@`
`90`	`90`	`'special-len': ITER_10 + ['5'],`
`91`	`91`	`'member_access': ITER_10 + ['5'],`
`92`	`92`	`'c_member_access': ITER_25 + ['5'],`
	`93`	`+ 'cpyext/c-list-iterating-obj': ITER_15 + ['10000000']`
`93`	`94`	`}`
`94`	`95`
`95`	`96`