Correctly wrap/unwrap 'NotImplemented'.

Author: fangerer

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

@@ -52,7 +52,7 @@ static void initialize_globals() {
     truffle_assign_managed(&_Py_NoneStruct, jnone);
 
     // NotImplemented
-    void *jnotimpl = polyglot_as__object(polyglot_get_member(PY_BUILTIN, "NotImplemented"));
+    void *jnotimpl = polyglot_as__object(to_sulong(polyglot_get_member(PY_BUILTIN, "NotImplemented")));
     truffle_assign_managed(&_Py_NotImplementedStruct, jnotimpl);
 
     // True, False

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -64,7 +64,7 @@ Object runNativeObject(PythonNativeObject object) {
             return object.object;
         }
 
-        @Specialization(guards = {"!isNativeClass(object)", "!isNativeObject(object)"})
+        @Specialization(guards = {"!isNativeClass(object)", "!isNativeObject(object)", "!isNoValue(object)"})
         Object runNativeObject(PythonAbstractObject object) {
             assert object != PNone.NO_VALUE;
             return PythonObjectNativeWrapper.wrap(object);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -109,7 +109,7 @@ abstract static class ReadNativeMemberNode extends PBaseNode {
         abstract Object execute(Object receiver, Object key);
 
         @Specialization(guards = "eq(OB_BASE, key)")
-        Object doObBase(PythonObject o, @SuppressWarnings("unused") String key) {
+        Object doObBase(PythonAbstractObject o, @SuppressWarnings("unused") String key) {
             return getToSulongNode().execute(o);
         }
 
@@ -124,12 +124,12 @@ Object doObBase(String o, @SuppressWarnings("unused") String key) {
         }
 
         @Specialization(guards = "eq(OB_REFCNT, key)")
-        int doObRefcnt(@SuppressWarnings("unused") PythonObject o, @SuppressWarnings("unused") String key) {
+        int doObRefcnt(@SuppressWarnings("unused") PythonAbstractObject o, @SuppressWarnings("unused") String key) {
             return 0;
         }
 
         @Specialization(guards = "eq(OB_TYPE, key)")
-        Object doObType(PythonObject object, @SuppressWarnings("unused") String key) {
+        Object doObType(PythonAbstractObject object, @SuppressWarnings("unused") String key) {
             return getToSulongNode().execute(getClass.execute(object));
         }