no need for cpython GC compatibility for these

Author: philippedistributive

include/JSArrayProxy.hh

@@ -164,24 +164,6 @@ public:
    */
   static PyObject *JSArrayProxy_clear_method(JSArrayProxy *self);
 
-  /**
-   * @brief .tp_clear method
-   *
-   * @param self - The JSArrayProxy
-   * @return 0 on success
-   */
-  static int JSArrayProxy_clear(JSArrayProxy *self);
-
-  /**
-   * @brief .tp_traverse method
-   *
-   * @param self - The JSArrayProxy
-   * @param visitproc - The function to be applied on each element of the list
-   * @param arg - The argument to the visit function
-   * @return 0 on success
-   */
-  static int JSArrayProxy_traverse(JSArrayProxy *self, visitproc visit, void *arg);
-
   /**
    * @brief copy method
    *

include/JSObjectProxy.hh

@@ -84,24 +84,6 @@ public:
    */
   static int JSObjectProxy_assign(JSObjectProxy *self, PyObject *key, PyObject *value);
 
-  /**
-   * @brief .tp_traverse method
-   *
-   * @param self - The JSObjectProxy
-   * @param visitproc - The function to be applied on each element of the dict
-   * @param arg - The argument to the visit function
-   * @return 0 on success
-   */
-  static int JSObjectProxy_traverse(JSObjectProxy *self, visitproc visit, void *arg);
-
-  /**
-   * @brief clear method
-   *
-   * @param self - The JSObjectProxy
-   * @return 0 on success
-   */
-  static int JSObjectProxy_clear(JSObjectProxy *self);
-
   /**
    * @brief Comparison method (.tp_richcompare), returns appropriate boolean given a comparison operator and other pyobject
    *

src/JSArrayProxy.cc

@@ -29,7 +29,6 @@ void JSArrayProxyMethodDefinitions::JSArrayProxy_dealloc(JSArrayProxy *self)
 {
   self->jsArray->set(nullptr);
   delete self->jsArray;
-  PyObject_GC_UnTrack(self);
   Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
@@ -736,17 +735,6 @@ PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_clear_method(JSArrayProxy
   Py_RETURN_NONE;
 }
 
-int JSArrayProxyMethodDefinitions::JSArrayProxy_clear(JSArrayProxy *self) {
-  JS::SetArrayLength(GLOBAL_CX, *(self->jsArray), 0);
-  return 0;
-}
-
-int JSArrayProxyMethodDefinitions::JSArrayProxy_traverse(JSArrayProxy *self, visitproc visit, void *arg) {
-  // Nothing to be done
-  // TODO do we need to iterate through the list and call traverse on proxied PyObjects?
-  return 0;
-}
-
 PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_copy(JSArrayProxy *self) {
   JS::Rooted<JS::ValueArray<2>> jArgs(GLOBAL_CX);
   jArgs[0].setInt32(0);

src/JSObjectProxy.cc

@@ -49,7 +49,6 @@ void JSObjectProxyMethodDefinitions::JSObjectProxy_dealloc(JSObjectProxy *self)
 {
   self->jsObject->set(nullptr);
   delete self->jsObject;
-  PyObject_GC_UnTrack(self);
   Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
@@ -183,17 +182,6 @@ int JSObjectProxyMethodDefinitions::JSObjectProxy_assign(JSObjectProxy *self, Py
   return 0;
 }
 
-int JSObjectProxyMethodDefinitions::JSObjectProxy_traverse(JSObjectProxy *self, visitproc visit, void *arg) {
-  // Nothing to be done
-  // TODO do we need to iterate through the dict and call traverse on proxied PyObjects?
-  return 0;
-}
-
-int JSObjectProxyMethodDefinitions::JSObjectProxy_clear(JSObjectProxy *self) {
-  JSObjectProxyMethodDefinitions::JSObjectProxy_clear_method(self);
-  return 0;
-}
-
 PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_richcompare(JSObjectProxy *self, PyObject *other, int op)
 {
   if (op != Py_EQ && op != Py_NE) {

src/modules/pythonmonkey/pythonmonkey.cc

@@ -104,10 +104,8 @@ PyTypeObject JSObjectProxyType = {
   .tp_as_mapping = &JSObjectProxy_mapping_methods,
   .tp_getattro = (getattrofunc)JSObjectProxyMethodDefinitions::JSObjectProxy_get,
   .tp_setattro = (setattrofunc)JSObjectProxyMethodDefinitions::JSObjectProxy_assign,
-  .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DICT_SUBCLASS | Py_TPFLAGS_HAVE_GC,
+  .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DICT_SUBCLASS,
   .tp_doc = PyDoc_STR("Javascript Object proxy dict"),
-  .tp_traverse = (traverseproc)JSObjectProxyMethodDefinitions::JSObjectProxy_traverse,
-  .tp_clear = (inquiry)JSObjectProxyMethodDefinitions::JSObjectProxy_clear,
   .tp_richcompare = (richcmpfunc)JSObjectProxyMethodDefinitions::JSObjectProxy_richcompare,
   .tp_iter = (getiterfunc)JSObjectProxyMethodDefinitions::JSObjectProxy_iter,
   .tp_methods = JSObjectProxy_methods,
@@ -156,10 +154,8 @@ PyTypeObject JSArrayProxyType = {
   .tp_as_sequence = &JSArrayProxy_sequence_methods,
   .tp_as_mapping = &JSArrayProxy_mapping_methods,
   .tp_getattro = (getattrofunc)JSArrayProxyMethodDefinitions::JSArrayProxy_get,
-  .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_LIST_SUBCLASS | Py_TPFLAGS_HAVE_GC,
+  .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_LIST_SUBCLASS,
   .tp_doc = PyDoc_STR("Javascript Array proxy list"),
-  .tp_traverse = (traverseproc)JSArrayProxyMethodDefinitions::JSArrayProxy_traverse,
-  .tp_clear = (inquiry)JSArrayProxyMethodDefinitions::JSArrayProxy_clear,
   .tp_richcompare = (richcmpfunc)JSArrayProxyMethodDefinitions::JSArrayProxy_richcompare,
   .tp_iter = (getiterfunc)JSArrayProxyMethodDefinitions::JSArrayProxy_iter,
   .tp_methods = JSArrayProxy_methods,