Fixing bool-oblivious hashing

Author: ckirsch

tools/bvdd.py

@@ -354,7 +354,7 @@ def __init__(self, i2o):
         self.i2o = i2o
 
     def __hash__(self):
-        return hash(tuple(self.i2o.items()))
+        return hash((tuple(self.i2o.items()), tuple(isinstance(o, bool) for o in self.i2o.values())))
 
     def __eq__(self, bvdd2):
         return type(bvdd2) is type(self) and self.i2o == bvdd2.i2o
@@ -447,7 +447,7 @@ def __init__(self, s2o):
         self.s2o = s2o
 
     def __hash__(self):
-        return hash(tuple(self.s2o.items()))
+        return hash((tuple(self.s2o.items()), tuple(isinstance(o, bool) for o in self.s2o.values())))
 
     def __eq__(self, bvdd2):
         return type(bvdd2) is type(self) and self.s2o == bvdd2.s2o
@@ -550,7 +550,7 @@ def __init__(self, o2s):
         self.o2s = o2s
 
     def __hash__(self):
-        return hash(tuple(self.o2s.items()))
+        return hash((tuple(self.o2s.items()), tuple(isinstance(o, bool) for o in self.o2s)))
 
     def __eq__(self, bvdd2):
         return type(bvdd2) is type(self) and self.o2s == bvdd2.o2s

tools/cflobvdd.py

@@ -1321,7 +1321,9 @@ def __str__(self):
             f"o: {self.outputs}\n")
 
     def __hash__(self):
-        return hash((self.grouping, tuple(self.outputs.values())))
+        return hash((self.grouping,
+            tuple(self.outputs.values()),
+            isinstance(self.outputs[1], bool)))
 
     def __eq__(self, n2):
         return (isinstance(n2, CFLOBVDD) and