Remove offset field from RegionAnnotation (#606)

Author: twizmwazin

claripy/annotation.py

@@ -112,20 +112,19 @@ class RegionAnnotation(SimplificationAvoidanceAnnotation):
     RegionAnnotations is treated as a ValueSet.
     """
 
-    def __init__(self, region_id, region_base_addr, offset):
+    def __init__(self, region_id, region_base_addr):
         self.region_id = region_id
         self.region_base_addr = region_base_addr
-        self.offset = offset
 
     #
     # Overriding base methods
     #
 
     def __hash__(self):
-        return hash((self.region_id, self.region_base_addr, hash(self.offset)))
+        return hash((self.region_id, self.region_base_addr))
 
     def __repr__(self):
-        return f"<RegionAnnotation {self.region_id}:{self.offset:#08x}>"
+        return f"<RegionAnnotation {self.region_id}@{self.region_base_addr:#08x}>"
 
 
 class UninitializedAnnotation(Annotation):

claripy/ast/bv.py

@@ -304,7 +304,7 @@ def ValueSet(bits: int, region: str, region_base_addr: int, value: BV | int):
         value = BVV(value, bits)
     value = value + region_base_addr
     # Annotate the bvs and return the new AST
-    return value.annotate(claripy.annotation.RegionAnnotation(region, region_base_addr, value))
+    return value.annotate(claripy.annotation.RegionAnnotation(region, region_base_addr))
 
 
 VS = ValueSet

claripy/backends/backend_vsa/backend_vsa.py

@@ -257,7 +257,7 @@ def apply_annotation(self, o, a):
                 )
 
             if isinstance(a, RegionAnnotation):
-                offset = self.convert(a.offset)
+                offset = o
                 if isinstance(offset, numbers.Number):
                     offset = StridedInterval(bits=o.bits, stride=0, lower_bound=offset, upper_bound=offset)
                 vs = ValueSet.empty(o.bits)