[GR-12699] [GR-13338] [GR-12554] [GR-13724] Remove mirroring of native classes.

PullRequest: graalpython/392

Author: fangerer

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

@@ -233,15 +233,8 @@ void* native_long_to_java(uint64_t val) {
         return Py_None;
     } else if (!truffle_cannot_be_handle(obj)) {
         return resolve_handle(cache, (uint64_t)obj);
-    } else {
-        void* refcnt = obj->ob_refcnt;
-        if (!truffle_cannot_be_handle(refcnt)) {
-            return resolve_handle(cache, refcnt);
-        } else if (IS_POINTER(refcnt)) {
-            return refcnt;
-        }
-        return obj;
     }
+    return obj;
 }
 
 __attribute__((always_inline))
@@ -259,25 +252,51 @@ PyObject* to_sulong(void *o) {
 
 /** to be used from Java code only; reads native 'ob_type' field */
 void* get_ob_type(PyObject* obj) {
-    PyTypeObject*  type = obj->ob_type;
+    PyTypeObject* type = obj->ob_type;
     if (!truffle_cannot_be_handle(type)) {
         return resolve_handle(cache, (uint64_t)type);
-    } else {
-        PyObject* cast_type = ((PyObject*)type);
-        if (!polyglot_is_value(cast_type)) {
-            // we have stored a handle to the Java class in ob_refcnt
-            void* handle = (void*)(cast_type->ob_refcnt);
-            if (!truffle_cannot_be_handle(handle)) {
-                return resolve_handle(cache, (uint64_t)handle);
-            } else {
-                // assume handle is a TruffleObject
-                return handle;
-            }
-        } else {
-            // the type is already the right value (e.g. on sandboxed it's a managed pointer)
-            return cast_type;
-        }
     }
+    return (void *)type;
+}
+
+/** to be used from Java code only; reads native 'tp_dict' field */
+PyObject* get_tp_dict(PyTypeObject* obj) {
+	return native_to_java(obj->tp_dict);
+}
+
+/** to be used from Java code only; reads native 'tp_bases' field */
+PyObject* get_tp_bases(PyTypeObject* obj) {
+	return native_to_java(obj->tp_bases);
+}
+
+/** to be used from Java code only; reads native 'tp_name' field */
+PyObject* get_tp_name(PyTypeObject* obj) {
+	return polyglot_from_string(obj->tp_name, SRC_CS);
+}
+
+/** to be used from Java code only; reads native 'tp_mro' field */
+PyObject* get_tp_mro(PyTypeObject* obj) {
+	return native_to_java(obj->tp_mro);
+}
+
+/** to be used from Java code only; reads native 'tp_subclasses' field */
+PyObject* get_tp_subclasses(PyTypeObject* obj) {
+	return native_to_java(obj->tp_subclasses);
+}
+
+/** to be used from Java code only; reads native 'tp_dictoffset' field */
+Py_ssize_t get_tp_dictoffset(PyTypeObject* obj) {
+	return obj->tp_dictoffset;
+}
+
+/** to be used from Java code only; reads native 'tp_itemsize' field */
+Py_ssize_t get_tp_itemsize(PyTypeObject* obj) {
+	return obj->tp_itemsize;
+}
+
+/** to be used from Java code only; reads native 'tp_basicsize' field */
+Py_ssize_t get_tp_basicsize(PyTypeObject* obj) {
+	return obj->tp_basicsize;
 }
 
 /** to be used from Java code only; returns the type ID for a byte array */

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

@@ -175,25 +175,16 @@ inline void* native_to_java(PyObject* obj) {
         return obj;
     } else if (!truffle_cannot_be_handle(obj)) {
         return resolve_handle(cache, (uint64_t)obj);
-    } else {
-        void* refcnt = obj->ob_refcnt;
-        if (!truffle_cannot_be_handle(refcnt)) {
-            return resolve_handle(cache, refcnt);
-        } else if (IS_POINTER(refcnt)) {
-            return refcnt;
-        }
-        return obj;
     }
+    return obj;
 }
 
 __attribute__((always_inline))
 inline void* native_type_to_java(PyTypeObject* type) {
-	if (IS_POINTER(((PyObject*)type)->ob_refcnt)) {
-		return (void*)((PyObject*)type)->ob_refcnt;
-	} else if (!truffle_cannot_be_handle(((PyObject*)type)->ob_refcnt)) {
-		return resolve_handle(cache, ((PyObject*)type)->ob_refcnt);
-	}
-	return (void*)type;
+	if (!truffle_cannot_be_handle(type)) {
+        return (void *)resolve_handle(cache, (uint64_t)type);
+    }
+    return (void *)type;
 }
 
 extern void* to_java(PyObject* obj);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -53,6 +53,7 @@ int PyModule_AddFunctions(PyObject* mod, PyMethodDef* methods) {
         polyglot_invoke(PY_TRUFFLE_CEXT,
                        "AddFunction",
                        native_to_java(mod),
+					   NULL,
                        polyglot_from_string((const char*)(def.ml_name), SRC_CS),
                        def.ml_meth,
                        get_method_flags_cwrapper(def.ml_flags),

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -141,7 +141,6 @@ PyObject _Py_NotImplementedStruct = {
 PyObject* PyType_GenericAlloc(PyTypeObject* cls, Py_ssize_t nitems) {
 	Py_ssize_t size = cls->tp_basicsize + cls->tp_itemsize * nitems;
     PyObject* newObj = (PyObject*)PyObject_Malloc(size);
-    memset(newObj, 0, size);
     if(cls->tp_dictoffset) {
     	*((PyObject **) ((char *)newObj + cls->tp_dictoffset)) = NULL;
     }