angr 9.2.118__py3-none-manylinux2014_aarch64.whl → 9.2.119__py3-none-manylinux2014_aarch64.whl

angr/storage/memory_object.py

@@ -11,6 +11,7 @@ def obj_bit_size(o):
 
 
 # TODO: get rid of is_bytes and have the bytes-backed objects be a separate class
+# pylint: disable=too-many-positional-arguments
 
 
 class SimMemoryObject:
@@ -56,10 +57,6 @@ class SimMemoryObject:
     def variables(self):
         return self.object.variables
 
-    @property
-    def cache_key(self):
-        return self.object.cache_key
-
     @property
     def symbolic(self):
         return self.object.symbolic
@@ -88,7 +85,7 @@ class SimMemoryObject:
     def bytes_at(self, addr, length, allow_concrete=False, endness="Iend_BE"):
         rev = endness != self.endness
         if allow_concrete and rev:
-            raise Exception("allow_concrete must be used with the stored endness")
+            raise ValueError("allow_concrete must be used with the stored endness")
 
         if self.is_bytes:
             if addr == self.base and length == self.length:
@@ -125,7 +122,7 @@ class SimMemoryObject:
 
         if self.is_bytes:
             return self.object == other.object
-        return self.object.cache_key == other.object.cache_key
+        return self.object.hash() == other.object.hash()
 
     def _length_equals(self, other):
         if type(self.length) is not type(other.length):
@@ -133,7 +130,7 @@ class SimMemoryObject:
 
         if isinstance(self.length, int):
             return self.length == other.length
-        return self.length.cache_key == other.length.cache_key
+        return self.length.hash() == other.length.hash()
 
     def __eq__(self, other):
         if self is other:
@@ -145,8 +142,7 @@ class SimMemoryObject:
         return self.base == other.base and self._object_equals(other) and self._length_equals(other)
 
     def __hash__(self):
-        obj_hash = hash(self.object) if self.is_bytes else self.object.cache_key
-        return hash((obj_hash, self.base, hash(self.length)))
+        return hash((self.object, self.base, self.length))
 
     def __ne__(self, other):
         return not self == other
@@ -156,6 +152,8 @@ class SimMemoryObject:
 
 
 class SimLabeledMemoryObject(SimMemoryObject):
+    """SimLabeledMemoryObject is a SimMemoryObject with a label"""
+
     __slots__ = ("label",)
 
     def __init__(self, obj, base, endness, length=None, byte_width=8, label=None):

angr/utils/timing.py

@@ -14,31 +14,43 @@ time_distribution = defaultdict(list)
 depth = 0
 
 
+def _t():
+    return time.perf_counter_ns() / 1000000
+
+
+def _on_func_return(func, start: float) -> None:
+    global depth
+
+    millisec = _t() - start
+    sec = millisec / 1000
+    if PRINT:
+        indent = " " * ((depth - 1) * 2)
+        if sec > 1.0:
+            print(f"[timing] {indent}{func.__name__} took {sec:f} seconds ({millisec:f} milliseconds).")
+        else:
+            print(f"[timing] {indent}{func.__name__} took {millisec:f} milliseconds.")
+    total_time[func] += millisec
+    if TIME_DISTRIBUTION:
+        time_distribution[func].append(millisec)
+    depth -= 1
+
+
 def timethis(func):
     @wraps(func)
     def timed_func(*args, **kwargs):
         if TIMING:
-
-            def _t():
-                return time.perf_counter_ns() / 1000000
-
             global depth
-            depth += 1
 
+            depth += 1
             start = _t()
-            r = func(*args, **kwargs)
-            millisec = _t() - start
-            sec = millisec / 1000
-            if PRINT:
-                indent = " " * ((depth - 1) * 2)
-                if sec > 1.0:
-                    print(f"[timing] {indent}{func.__name__} took {sec:f} seconds ({millisec:f} milliseconds).")
-                else:
-                    print(f"[timing] {indent}{func.__name__} took {millisec:f} milliseconds.")
-            total_time[func] += millisec
-            if TIME_DISTRIBUTION:
-                time_distribution[func].append(millisec)
-            depth -= 1
+            r = None
+            try:
+                r = func(*args, **kwargs)
+            except Exception:
+                _on_func_return(func, start)
+                raise
+
+            _on_func_return(func, start)
             return r
         return func(*args, **kwargs)
 

{angr-9.2.118.dist-info → angr-9.2.119.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.118
+Version: 9.2.119
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -15,13 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.118
-Requires-Dist: archinfo==9.2.118
+Requires-Dist: ailment==9.2.119
+Requires-Dist: archinfo==9.2.119
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.118
-Requires-Dist: cle==9.2.118
+Requires-Dist: claripy==9.2.119
+Requires-Dist: cle==9.2.119
 Requires-Dist: dpkt
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=3.19.0
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.118
+Requires-Dist: pyvex==9.2.119
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy
@@ -47,6 +47,8 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Provides-Extra: pcode
 Requires-Dist: pypcode~=3.0; extra == "pcode"
+Provides-Extra: telemetry
+Requires-Dist: opentelemetry-api; extra == "telemetry"
 Provides-Extra: testing
 Requires-Dist: keystone-engine; extra == "testing"
 Requires-Dist: pypcode~=3.0; extra == "testing"