Move other Base members to rust

Author: twizmwazin

claripy/ast/base.py

@@ -100,29 +100,7 @@ class Base(clarirs.Base, metaclass=type):
     :ivar args:                     The arguments that are being used
     """
 
-    __slots__ = [
-        # "op",
-        # "args",
-        # "variables",
-        # "symbolic",
-        "_hash",
-        "_simplified",
-        "_cached_encoded_name",
-        "_cache_key",
-        "_errored",
-        "_eager_backends",
-        # "length",
-        "_excavated",
-        "_burrowed",
-        "_uninitialized",
-        "_uc_alloc_depth",
-        # "annotations",
-        "simplifiable",
-        "_uneliminatable_annotations",
-        "_relocatable_annotations",
-        "depth",
-        "__weakref__",
-    ]
+    __slots__ = ()
     _hash_cache = weakref.WeakValueDictionary()
     _leaf_cache = weakref.WeakValueDictionary()
 

src/lib.rs

@@ -1,9 +1,8 @@
-use std::collections::HashSet;
-
 use pyo3::{prelude::*, types::PyTuple};
 
-#[pyclass(subclass)]
+#[pyclass(subclass, weakref)]
 struct Base {
+    // Hashcons
     #[pyo3(get, set)]
     op: String,
     #[pyo3(get, set)]
@@ -16,13 +15,46 @@ struct Base {
     symbolic: bool,
     #[pyo3(get, set)]
     annotations: Py<PyTuple>,
+
+    // Not Hashcons
+    #[pyo3(get, set)]
+    simplifiable: Option<PyObject>,
+    #[pyo3(get, set)]
+    depth: Option<PyObject>,
+
+    #[pyo3(get, set)]
+    _hash: Option<PyObject>,
+    #[pyo3(get, set)]
+    _simplified: Option<PyObject>,
+    #[pyo3(get, set)]
+    _cache_key: Option<PyObject>,
+    #[pyo3(get, set)]
+    _cached_encoded_name: Option<PyObject>,
+    #[pyo3(get, set)]
+    _errored: Option<PyObject>,
+    #[pyo3(get, set)]
+    _eager_backends: Option<PyObject>,
+    #[pyo3(get, set)]
+    _excavated: Option<PyObject>,
+    #[pyo3(get, set)]
+    _burrowed: Option<PyObject>,
+    #[pyo3(get, set)]
+    _uninitialized: Option<PyObject>,
+    #[pyo3(get, set)]
+    _uc_alloc_depth: Option<PyObject>,
+    #[pyo3(get, set)]
+    _uneliminatable_annotations: Option<PyObject>,
+    #[pyo3(get, set)]
+    _relocatable_annotations: Option<PyObject>,
+
 }
 
 #[pymethods]
 impl Base {
     #[new]
     #[pyo3(signature = (op, args, length, variables, symbolic, annotations))]
     fn new(
+        py: Python,
         op: String,
         args: Py<PyTuple>,
         length: PyObject,
@@ -37,6 +69,22 @@ impl Base {
             variables,
             symbolic,
             annotations,
+
+            simplifiable: None,
+            depth: None,
+
+            _hash: None,
+            _simplified: None,
+            _cache_key: None,
+            _cached_encoded_name: None,
+            _errored: None,
+            _eager_backends: None,
+            _excavated: None,
+            _burrowed: None,
+            _uninitialized: None,
+            _uc_alloc_depth: None,
+            _uneliminatable_annotations: None,
+            _relocatable_annotations: None,
         })
     }
 }