Add assertion that an object is native

Author: msimacek

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

@@ -58,6 +58,13 @@ def assert_raises(err, fn, *args, **kwargs):
     assert raised
 
 
+if sys.implementation.name == 'graalpy':
+    is_native_object = __graalpython__.is_native_object
+else:
+    def is_native_object(obj):
+        return True
+
+
 def unhandled_error_compare(x, y):
     if (isinstance(x, BaseException) and isinstance(y, BaseException)):
         return type(x) == type(y)

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

@@ -38,7 +38,8 @@
 # SOFTWARE.
 import unittest
 
-from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, CPyExtType
+from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, CPyExtType, \
+    is_native_object
 
 __dir__ = __file__.rpartition("/")[0]
 
@@ -589,6 +590,7 @@ def test_create_from_buffer_exception(self):
 class TestNativeSubclass(unittest.TestCase):
     def test_builtins(self):
         b = BytesSubclass(b"hello")
+        assert is_native_object(b)
         assert type(b) == BytesSubclass
         assert b
         assert not BytesSubclass(b'')

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

@@ -41,7 +41,7 @@
 import warnings
 
 from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionVoid, unhandled_error_compare, \
-    CPyExtType
+    CPyExtType, is_native_object
 
 __dir__ = __file__.rpartition("/")[0]
 
@@ -660,10 +660,17 @@ def raise_native_exception():
 
 
 class TestNativeExceptionSubclass:
+    def test_init(self):
+        e = ExceptionSubclass(1, 2, 3)
+        assert is_native_object(e)
+        assert type(e) == ExceptionSubclass
+        assert isinstance(e, Exception)
+
     def test_raise_type(self):
         try:
             raise ExceptionSubclass
         except ExceptionSubclass as e:
+            assert is_native_object(e)
             assert e.args == ()
         else:
             assert False
@@ -672,6 +679,7 @@ def test_raise_instance(self):
         try:
             raise ExceptionSubclass(1)
         except ExceptionSubclass as e:
+            assert is_native_object(e)
             assert e.args == (1,)
         else:
             assert False
@@ -780,6 +788,7 @@ def gen():
         g = gen()
         next(g)
         e = g.throw(ExceptionSubclass)
+        assert is_native_object(e)
         assert type(e) == ExceptionSubclass
 
         g = gen()

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

@@ -38,7 +38,8 @@
 # SOFTWARE.
 import unittest
 
-from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON, CPyExtType
+from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, CPyExtType, \
+    is_native_object
 
 __dir__ = __file__.rpartition("/")[0]
 
@@ -250,6 +251,8 @@ def compile_module(self, name):
 class TestNativeSubclass(unittest.TestCase):
     def test_builtins(self):
         t = TupleSubclass(1, 2, 3)
+        assert type(t) == TupleSubclass
+        assert is_native_object(t)
         assert t
         assert len(t) == 3
         assert t[1] == 2

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -84,6 +84,7 @@
 import com.oracle.graal.python.builtins.modules.GraalPythonModuleBuiltinsFactory.DebugNodeFactory;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
@@ -916,6 +917,21 @@ Object doit() {
         }
     }
 
+    @Builtin(name = "is_native_object", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class IsNativeObject extends PythonUnaryBuiltinNode {
+        @Specialization
+        boolean isNative(@SuppressWarnings("unused") PythonAbstractNativeObject obj) {
+            return true;
+        }
+
+        @Fallback
+        boolean isNative(@SuppressWarnings("unused") Object obj) {
+            return false;
+        }
+
+    }
+
     // This is only used from HPy
     @Builtin(name = "PyTruffle_CreateType", minNumOfPositionalArgs = 4)
     @GenerateNodeFactory