Move hashcons to native base

Author: twizmwazin

claripy/ast/base.py

@@ -101,22 +101,22 @@ class Base(clarirs.Base, metaclass=type):
     """
 
     __slots__ = [
-        "op",
-        "args",
-        "variables",
-        "symbolic",
+        # "op",
+        # "args",
+        # "variables",
+        # "symbolic",
         "_hash",
         "_simplified",
         "_cached_encoded_name",
         "_cache_key",
         "_errored",
         "_eager_backends",
-        "length",
+        # "length",
         "_excavated",
         "_burrowed",
         "_uninitialized",
         "_uc_alloc_depth",
-        "annotations",
+        # "annotations",
         "simplifiable",
         "_uneliminatable_annotations",
         "_relocatable_annotations",
@@ -286,7 +286,15 @@ def __new__(cls, op, args, add_variables=None, hash=None, **kwargs):  # pylint:d
             h = Base._calc_hash(op, a_args, kwargs) if hash is None else hash
         self = cache.get(h, None)
         if self is None:
-            self = super().__new__(cls)
+            self = super().__new__(
+                cls,
+                op,
+                tuple(args),
+                kwargs.get("length", None),
+                frozenset(kwargs["variables"]),
+                kwargs["symbolic"],
+                annotations,
+            )
             depth = arg_max_depth + 1
             self.__a_init__(
                 op,
@@ -314,7 +322,15 @@ def __init_with_annotations__(
         if self is not None:
             return self
 
-        self = super().__new__(cls)
+        self = super().__new__(
+            cls,
+            op,
+            tuple(a_args),
+            kwargs.get("length", None),
+            frozenset(kwargs["variables"]),
+            kwargs["symbolic"],
+            tuple(kwargs.get("annotations", ())),
+        )
         self.__a_init__(
             op,
             a_args,
@@ -476,12 +492,13 @@ def __a_init__(
 
         # HASHCONS: these attributes key the cache
         # BEFORE CHANGING THIS, SEE ALL OTHER INSTANCES OF "HASHCONS" IN THIS FILE
-        self.op = op
-        self.args = args if type(args) is tuple else tuple(args)
-        self.length = length
-        self.variables = frozenset(variables) if type(variables) is not frozenset else variables
-        self.symbolic = symbolic
-        self.annotations: tuple[Annotation] = annotations
+        # super().__new__(op, args, length, frozenset(variables), symbolic, annotations)
+        # self.op = op
+        # self.args = args if type(args) is tuple else tuple(args)
+        # self.length = length
+        # self.variables = frozenset(variables) if type(variables) is not frozenset else variables
+        # self.symbolic = symbolic
+        # self.annotations: tuple[Annotation] = annotations
         self._uneliminatable_annotations = uneliminatable_annotations
         self._relocatable_annotations = relocatable_annotations
 

src/lib.rs

@@ -1,14 +1,43 @@
-use pyo3::prelude::*;
+use std::collections::HashSet;
 
+use pyo3::{prelude::*, types::PyTuple};
 
 #[pyclass(subclass)]
-struct Base {}
+struct Base {
+    #[pyo3(get, set)]
+    op: String,
+    #[pyo3(get, set)]
+    args: Py<PyTuple>,
+    #[pyo3(get, set)]
+    length: PyObject,
+    #[pyo3(get, set)]
+    variables: PyObject, // TODO: This should be a HashSet, leave opaque for now
+    #[pyo3(get, set)]
+    symbolic: bool,
+    #[pyo3(get, set)]
+    annotations: Py<PyTuple>,
+}
 
 #[pymethods]
 impl Base {
     #[new]
-    fn new() -> Self {
-        Base {}
+    #[pyo3(signature = (op, args, length, variables, symbolic, annotations))]
+    fn new(
+        op: String,
+        args: Py<PyTuple>,
+        length: PyObject,
+        variables: PyObject,
+        symbolic: bool,
+        annotations: Py<PyTuple>,
+    ) -> PyResult<Self> {
+        Ok(Base {
+            op,
+            args,
+            length,
+            variables,
+            symbolic,
+            annotations,
+        })
     }
 }