angr 9.2.116__py3-none-win_amd64.whl → 9.2.118__py3-none-win_amd64.whl

angr/storage/file.py

@@ -1,7 +1,9 @@
-import claripy
+from __future__ import annotations
 import logging
 import itertools
 
+import claripy
+
 from .memory_mixins import DefaultMemory
 from ..state_plugins.plugin import SimStatePlugin
 from ..state_plugins.sim_action_object import SimActionObject
@@ -42,8 +44,7 @@ class Flags:  # pylint: disable=W0232,
 def _deps_unpack(a):
     if isinstance(a, SimActionObject):
         return a.ast, a.reg_deps, a.tmp_deps
-    else:
-        return a, None, None
+    return a, None, None
 
 
 class SimFileBase(SimStatePlugin):
@@ -211,9 +212,8 @@ class SimFile(SimFileBase, DefaultMemory):  # TODO: pick a better base class omg
         elif isinstance(content, claripy.Bits):
             if concrete is None and not content.symbolic:
                 concrete = True
-            pass
         else:
-            raise TypeError("Can't handle SimFile content of type %s" % type(content))
+            raise TypeError(f"Can't handle SimFile content of type {type(content)}")
 
         if concrete is None:
             concrete = False
@@ -264,7 +264,7 @@ class SimFile(SimFileBase, DefaultMemory):  # TODO: pick a better base class omg
         data = self.load(0, size)
 
         kwargs["cast_to"] = kwargs.get("cast_to", bytes)
-        kwargs["extra_constraints"] = tuple(kwargs.get("extra_constraints", ())) + (self._size == size,)
+        kwargs["extra_constraints"] = (*tuple(kwargs.get("extra_constraints", ())), self._size == size)
         return self.state.solver.eval(data, **kwargs)
 
     def read(self, pos, size, **kwargs):
@@ -291,31 +291,30 @@ class SimFile(SimFileBase, DefaultMemory):  # TODO: pick a better base class omg
         # If it's not possible to EOF (because there's no EOF), this is very simple!
         if not self.has_end:
             # bump the storage size as we read
-            self._size = self.state.solver.If(size + pos > self._size, size + pos, self._size)
+            self._size = claripy.If(size + pos > self._size, size + pos, self._size)
             return self.load(pos, passed_max_size, disable_actions=disable_actions, inspect=inspect), size, size + pos
 
         # Step 2.2: check harder for the possibility of EOFs
         # This is the size if we're reading to the end of the file
         distance_to_eof = self._size - pos
-        distance_to_eof = self.state.solver.If(self.state.solver.SLE(distance_to_eof, 0), 0, distance_to_eof)
+        distance_to_eof = claripy.If(claripy.SLE(distance_to_eof, 0), 0, distance_to_eof)
 
         # try to frontload some constraint solving to see if it's impossible for this read to EOF
         if self.state.solver.satisfiable(extra_constraints=(size > distance_to_eof,)):
             # it's possible to EOF
             # final size = min(passed_size, max(distance_to_eof, 0))
-            real_size = self.state.solver.If(size >= distance_to_eof, distance_to_eof, size)
+            real_size = claripy.If(size >= distance_to_eof, distance_to_eof, size)
 
             return (
                 self.load(pos, passed_max_size, disable_actions=disable_actions, inspect=inspect),
                 real_size,
                 real_size + pos,
             )
-        else:
-            # it's not possible to EOF
-            # we don't need to constrain or min/max the output size because there are already constraints asserting
-            # that the total filesize is pretty big
-            # note: this assumes that constraints cannot be removed
-            return self.load(pos, passed_max_size, disable_actions=disable_actions, inspect=inspect), size, size + pos
+        # it's not possible to EOF
+        # we don't need to constrain or min/max the output size because there are already constraints asserting
+        # that the total filesize is pretty big
+        # note: this assumes that constraints cannot be removed
+        return self.load(pos, passed_max_size, disable_actions=disable_actions, inspect=inspect), size, size + pos
 
     def write(self, pos, data, size=None, events=True, **kwargs):
         if events:
@@ -327,7 +326,7 @@ class SimFile(SimFileBase, DefaultMemory):  # TODO: pick a better base class omg
         # \(_^^)/
         self.store(pos, data, size=size)
         new_end = _deps_unpack(pos + size)[0]  # decline to store SAO
-        self._size = self.state.solver.If(new_end > self._size, new_end, self._size)
+        self._size = claripy.If(new_end > self._size, new_end, self._size)
         return new_end
 
     @SimStatePlugin.memo
@@ -349,7 +348,7 @@ class SimFile(SimFileBase, DefaultMemory):  # TODO: pick a better base class omg
         if any(o.has_end != self.has_end for o in others):
             raise SimMergeError("Cannot merge files where some have ends and some don't")
 
-        self._size = self.state.solver.ite_cases(zip(merge_conditions[1:], (o._size for o in others)), self._size)
+        self._size = claripy.ite_cases(zip(merge_conditions[1:], (o._size for o in others)), self._size)
 
         return super().merge(others, merge_conditions, common_ancestor=common_ancestor)
 
@@ -378,7 +377,7 @@ class SimFileStream(SimFile):
     def set_state(self, state):
         super().set_state(state)
         if type(self.pos) is int:
-            self.pos = state.solver.BVV(self.pos, state.arch.bits)
+            self.pos = claripy.BVV(self.pos, state.arch.bits)
         elif len(self.pos) != state.arch.bits:
             raise TypeError("SimFileStream position must be a bitvector of size %d (arch.bits)" % state.arch.bits)
 
@@ -393,7 +392,7 @@ class SimFileStream(SimFile):
 
     def write(self, _, data, size=None, **kwargs):
         self.pos = super().write(self.pos, data, size, **kwargs)
-        return None
+        return
 
     @SimStatePlugin.memo
     def copy(self, memo):
@@ -402,7 +401,7 @@ class SimFileStream(SimFile):
         return c
 
     def merge(self, others, merge_conditions, common_ancestor=None):  # pylint: disable=unused-argument
-        self.pos = self.state.solver.ite_cases(zip(merge_conditions[1:], [o.pos for o in others]), self.pos)
+        self.pos = claripy.ite_cases(zip(merge_conditions[1:], [o.pos for o in others]), self.pos)
         return super().merge(others, merge_conditions, common_ancestor=common_ancestor)
 
 
@@ -511,9 +510,9 @@ class SimPackets(SimFileBase):
             pos = len(self.content)
         if pos < 0:
             raise SimFileError("SimPacket.read(%d): Negative packet number?" % pos)
-        elif pos > len(self.content):
+        if pos > len(self.content):
             raise SimFileError("SimPacket.read(%d): Packet number is past frontier of %d?" % (pos, len(self.content)))
-        elif pos != len(self.content):
+        if pos != len(self.content):
             _, realsize = self.content[pos]
             self.state.add_constraints(realsize <= size)  # assert that the packet fits within the read request
             if not self.state.solver.satisfiable():
@@ -525,7 +524,7 @@ class SimPackets(SimFileBase):
 
         # Type check
         if type(size) is int:
-            size = self.state.solver.BVV(size, self.state.arch.bits)
+            size = claripy.BVV(size, self.state.arch.bits)
 
         # The read is on the frontier. let's generate a new packet.
         orig_size = size
@@ -568,7 +567,7 @@ class SimPackets(SimFileBase):
         )
         packet = (data, size)
         self.content.append(packet)
-        return packet + (pos + 1,)
+        return (*packet, pos + 1)
 
     def write(self, pos, data, size=None, events=True, **kwargs):
         """
@@ -596,16 +595,16 @@ class SimPackets(SimFileBase):
         if size is None:
             size = len(data) // self.state.arch.byte_width if isinstance(data, claripy.Bits) else len(data)
         if type(size) is int:
-            size = self.state.solver.BVV(size, self.state.arch.bits)
+            size = claripy.BVV(size, self.state.arch.bits)
 
         # sanity check on packet number and determine if data is already present
         if pos is None:
             pos = len(self.content)
         if pos < 0:
             raise SimFileError("SimPacket.write(%d): Negative packet number?" % pos)
-        elif pos > len(self.content):
+        if pos > len(self.content):
             raise SimFileError("SimPacket.write(%d): Packet number is past frontier of %d?" % (pos, len(self.content)))
-        elif pos != len(self.content):
+        if pos != len(self.content):
             realdata, realsize = self.content[pos]
             maxlen = max(len(realdata), len(data))
             self.state.add_constraints(realdata[maxlen - 1 : 0] == data[maxlen - 1 : 0])
@@ -630,7 +629,7 @@ class SimPackets(SimFileBase):
         for o in others:
             if o.write_mode is None:
                 continue
-            elif self.write_mode is None:
+            if self.write_mode is None:
                 self.write_mode = o.write_mode
             elif self.write_mode is not o.write_mode:
                 raise SimMergeError("Cannot merge SimPackets with disparate write_mode")
@@ -641,16 +640,14 @@ class SimPackets(SimFileBase):
 
         for i, default in enumerate(self.content):
             max_data_length = max(len(default[0]), max(len(o.content[i][0]) for o in others))
-            merged_data = self.state.solver.ite_cases(
+            merged_data = claripy.ite_cases(
                 zip(
                     merge_conditions[1:],
                     (o.content[i][0].concat(claripy.BVV(0, max_data_length - len(o.content[i][0]))) for o in others),
                 ),
                 default[0],
             )
-            merged_size = self.state.solver.ite_cases(
-                zip(merge_conditions[1:], (o.content[i][1] for o in others)), default[1]
-            )
+            merged_size = claripy.ite_cases(zip(merge_conditions[1:], (o.content[i][1] for o in others)), default[1])
             self.content[i] = (merged_data, merged_size)
 
         return True
@@ -688,7 +685,7 @@ class SimPacketsStream(SimPackets):
 
     def write(self, _, data, size=None, **kwargs):
         self.pos = super().write(self.pos, data, size, **kwargs)
-        return None
+        return
 
     @SimStatePlugin.memo
     def copy(self, memo):
@@ -917,7 +914,7 @@ class SimFileDescriptor(SimFileDescriptorBase):
             return claripy.false
 
         if type(offset) is int:
-            offset = self.state.solver.BVV(offset, self.state.arch.bits)
+            offset = claripy.BVV(offset, self.state.arch.bits)
 
         if whence == "start":
             new_pos = offset
@@ -926,10 +923,8 @@ class SimFileDescriptor(SimFileDescriptorBase):
         elif whence == "end":
             new_pos = self.file.size + offset
 
-        success_condition = self.state.solver.And(
-            self.state.solver.SGE(new_pos, 0), self.state.solver.SLE(new_pos, self.file.size)
-        )
-        self._pos = _deps_unpack(self.state.solver.If(success_condition, new_pos, self._pos))[0]
+        success_condition = claripy.And(claripy.SGE(new_pos, 0), claripy.SLE(new_pos, self.file.size))
+        self._pos = _deps_unpack(claripy.If(success_condition, new_pos, self._pos))[0]
         return success_condition
 
     def eof(self):
@@ -1006,7 +1001,7 @@ class SimFileDescriptor(SimFileDescriptorBase):
         elif self._pos is None or any(o._pos is None for o in others):
             raise SimMergeError("Cannot merge SimFileDescriptors with inconsistent None-position - please report this!")
         else:
-            self._pos = self.state.solver.ite_cases(zip(merge_conditions[1:], (o._pos for o in others)), self._pos)
+            self._pos = claripy.ite_cases(zip(merge_conditions[1:], (o._pos for o in others)), self._pos)
 
         return True
 
@@ -1113,9 +1108,7 @@ class SimFileDescriptorDuplex(SimFileDescriptorBase):
         elif self._read_pos is None or any(o._read_pos is None for o in others):
             raise SimMergeError("Cannot merge SimFileDescriptors with inconsistent None-position - please report this!")
         else:
-            self._read_pos = self.state.solver.ite_cases(
-                zip(merge_conditions[1:], (o._read_pos for o in others)), self._read_pos
-            )
+            self._read_pos = claripy.ite_cases(zip(merge_conditions[1:], (o._read_pos for o in others)), self._read_pos)
 
         if type(self._write_pos) is int and all(type(o._write_pos) is int for o in others):
             if any(o._write_pos != self._write_pos for o in others):
@@ -1125,7 +1118,7 @@ class SimFileDescriptorDuplex(SimFileDescriptorBase):
         elif self._write_pos is None or any(o._write_pos is None for o in others):
             raise SimMergeError("Cannot merge SimFileDescriptors with inconsistent None-position - please report this!")
         else:
-            self._write_pos = self.state.solver.ite_cases(
+            self._write_pos = claripy.ite_cases(
                 zip(merge_conditions[1:], (o._write_pos for o in others)), self._write_pos
             )
 
@@ -1159,12 +1152,12 @@ class SimPacketsSlots(SimFileBase):
 
     def read(self, pos, size, **kwargs):
         if not self.read_sizes:
-            return self.state.solver.BVV(0, 0), 0, None
+            return claripy.BVV(0, 0), 0, None
 
         try:
             req_size = self.state.solver.eval_one(size)
-        except SimSolverError:
-            raise SimFileError("SimPacketsSlots can't handle multivalued read sizes")
+        except SimSolverError as err:
+            raise SimFileError("SimPacketsSlots can't handle multivalued read sizes") from err
 
         avail_size = self.read_sizes[0]
 
@@ -1206,7 +1199,7 @@ class SimPacketsSlots(SimFileBase):
             raise SimMergeError("Can't merge SimPacketsSlots with disparate reads")
 
         for i, default_var in self.read_data:
-            self.read_data[i] = self.state.solver.ite_cases(
+            self.read_data[i] = claripy.ite_cases(
                 zip(merge_conditions[1:], [o.read_data[i] for o in others]), default_var
             )
 

angr/storage/memory_mixins/__init__.py

@@ -1,4 +1,5 @@
 # pylint:disable=abstract-method,wrong-import-position,unused-argument,missing-class-docstring,arguments-differ
+from __future__ import annotations
 from typing import Tuple, Dict, Any, Optional
 from collections.abc import Iterable
 
@@ -32,14 +33,13 @@ class MemoryMixin(SimStatePlugin):
         if self.id in ("reg", "mem"):
             return self.id
 
-        elif self.id.startswith("file"):
+        if self.id.startswith("file"):
             return "file"
 
-        elif "_" in self.id:
+        if "_" in self.id:
             return self.id.split("_")[0]
 
-        else:
-            raise SimMemoryError('Unknown SimMemory category for memory_id "%s"' % self.id)
+        raise SimMemoryError(f'Unknown SimMemory category for memory_id "{self.id}"')
 
     @property
     def variable_key_prefix(self):
@@ -53,10 +53,7 @@ class MemoryMixin(SimStatePlugin):
 
     def _add_constraints(self, c, add_constraints=True, condition=None, **kwargs):
         if add_constraints:
-            if condition is not None:
-                to_add = (c & condition) | ~condition
-            else:
-                to_add = c
+            to_add = c & condition | ~condition if condition is not None else c
             self.state.add_constraints(to_add)
 
     def load(self, addr, size=None, **kwargs):
@@ -94,7 +91,7 @@ class MemoryMixin(SimStatePlugin):
         :param writing:
         :return:        A memoryview into the loaded bytes.
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def erase(self, addr, size=None, **kwargs) -> None:
         """
@@ -105,7 +102,7 @@ class MemoryMixin(SimStatePlugin):
         :param size:    The number of bytes for erasing.
         :return:        None
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def _default_value(self, addr, size, name=None, inspect=True, events=True, key=None, **kwargs):
         """
@@ -127,7 +124,7 @@ class MemoryMixin(SimStatePlugin):
         :param merged_size:     The size (in bytes) of the merged value.
         :return:                The merged value, or None to skip merging of the current value.
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def _merge_labels(self, labels: Iterable[dict], **kwargs) -> dict | None:
         """
@@ -136,13 +133,13 @@ class MemoryMixin(SimStatePlugin):
         :param labels:          A collection of labels.
         :return:                The merged label, or None to skip merging of the current label.
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def replace_all(self, old: claripy.ast.BV, new: claripy.ast.BV):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def _replace_all(self, addrs: Iterable[int], old: claripy.ast.BV, new: claripy.ast.BV):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def copy_contents(self, dst, src, size, condition=None, **kwargs):
         """
@@ -155,7 +152,7 @@ class MemoryMixin(SimStatePlugin):
         :param kwargs:      Other parameters.
         :return:        None
         """
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 from .actions_mixin import ActionsMixinHigh, ActionsMixinLow

angr/storage/memory_mixins/__init__.pyi

@@ -1,8 +1,7 @@
 import claripy
-from typing import Union, Optional, List
 from angr.state_plugins.sim_action_object import SimActionObject
 
-_Coerce = Union[int, claripy.ast.bv.BV, SimActionObject]
+_Coerce = int | claripy.ast.bv.BV | SimActionObject
 
 class DefaultMemory:
     SUPPORTS_CONCRETE_LOAD: bool
@@ -11,24 +10,24 @@ class DefaultMemory:
     def store(
         self,
         addr: _Coerce,
-        data: Union[_Coerce, bytes],
-        size: Optional[_Coerce] = None,
-        condition: Optional[claripy.ast.bool.Bool] = None,
+        data: _Coerce | bytes,
+        size: _Coerce | None = None,
+        condition: claripy.ast.bool.Bool | None = None,
         **kwargs,
     ) -> None: ...
     def load(
         self,
         addr: _Coerce,
-        size: Optional[_Coerce] = None,
-        condition: Optional[claripy.ast.bool.Bool] = None,
-        fallback: Optional[_Coerce] = None,
+        size: _Coerce | None = None,
+        condition: claripy.ast.bool.Bool | None = None,
+        fallback: _Coerce | None = None,
         **kwargs,
     ) -> claripy.ast.bv.BV: ...
     def find(
-        self, addr: _Coerce, what: _Coerce, max_search: int, default: Optional[_Coerce] = None, **kwargs
+        self, addr: _Coerce, what: _Coerce, max_search: int, default: _Coerce | None = None, **kwargs
     ) -> claripy.ast.bv.BV: ...
     def copy_contents(
-        self, dst: _Coerce, src: _Coerce, size: _Coerce, condition: Optional[claripy.ast.bool.Bool] = None, **kwargs
+        self, dst: _Coerce, src: _Coerce, size: _Coerce, condition: claripy.ast.bool.Bool | None = None, **kwargs
     ) -> None: ...
     def copy(self, memo: dict) -> DefaultMemory: ...
     @property
@@ -37,11 +36,11 @@ class DefaultMemory:
     def variable_key_prefix(self) -> str: ...
     def merge(
         self,
-        others: List[DefaultMemory],
-        merge_conditions: List[claripy.ast.bool.Bool],
-        common_ancestor: Optional[DefaultMemory] = ...,
+        others: list[DefaultMemory],
+        merge_conditions: list[claripy.ast.bool.Bool],
+        common_ancestor: DefaultMemory | None = ...,
     ) -> bool: ...
-    def permissions(self, addr: _Coerce, permissions: Optional[_Coerce] = ..., **kwargs) -> None: ...
+    def permissions(self, addr: _Coerce, permissions: _Coerce | None = ..., **kwargs) -> None: ...
     def map_region(self, addr: _Coerce, length: int, permissions: _Coerce, init_zero: bool = ..., **kwargs) -> None: ...
     def unmap_region(self, addr: _Coerce, length: int, **kwargs) -> None: ...
     def concrete_load(self, addr: _Coerce, size: int, writing: bool = ..., **kwargs) -> memoryview: ...

angr/storage/memory_mixins/actions_mixin.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+import claripy
+
 from ...state_plugins.sim_action import SimActionData, SimActionObject
 from ... import sim_options as o
 from . import MemoryMixin
@@ -43,12 +46,12 @@ class ActionsMixinHigh(MemoryMixin):
             self.state, region_type, kind, addr=addr, data=data, size=ref_size, condition=condition, fallback=fallback
         )
 
-        action.added_constraints = self.state.solver.true
+        action.added_constraints = claripy.true
         return action
 
     def _add_constraints(self, c, action=None, **kwargs):
         if action is not None:
-            action.added_constraints = self.state.solver.And(action.added_constraints, c)
+            action.added_constraints = claripy.And(action.added_constraints, c)
         return super()._add_constraints(c, action=action, **kwargs)
 
 

angr/storage/memory_mixins/address_concretization_mixin.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 from . import MemoryMixin
@@ -183,7 +184,7 @@ class AddressConcretizationMixin(MemoryMixin):
                 return a
 
         # well, we tried
-        raise SimMemoryAddressError("Unable to concretize address for %s with the provided strategies." % action)
+        raise SimMemoryAddressError(f"Unable to concretize address for {action} with the provided strategies.")
 
     def concretize_write_addr(self, addr, strategies=None, condition=None):
         """
@@ -197,7 +198,7 @@ class AddressConcretizationMixin(MemoryMixin):
 
         if isinstance(addr, int):
             return [addr]
-        elif not self.state.solver.symbolic(addr):
+        if not self.state.solver.symbolic(addr):
             return [self.state.solver.eval(addr)]
 
         strategies = self.write_strategies if strategies is None else strategies
@@ -214,7 +215,7 @@ class AddressConcretizationMixin(MemoryMixin):
 
         if isinstance(addr, int):
             return [addr]
-        elif not self.state.solver.symbolic(addr):
+        if not self.state.solver.symbolic(addr):
             return [self.state.solver.eval(addr)]
 
         strategies = self.read_strategies if strategies is None else strategies
@@ -254,8 +255,7 @@ class AddressConcretizationMixin(MemoryMixin):
 
         if read_value is None:
             return sub_value
-        else:
-            return self.state.solver.If(addr == concrete_addr, sub_value, read_value)
+        return claripy.If(addr == concrete_addr, sub_value, read_value)
 
     def load(self, addr, size=None, condition=None, **kwargs):
         if type(size) is not int:
@@ -264,7 +264,7 @@ class AddressConcretizationMixin(MemoryMixin):
         # Fast path
         if type(addr) is int:
             return self._load_one_addr(addr, True, addr, condition, size, read_value=None, **kwargs)
-        elif not self.state.solver.symbolic(addr):
+        if not self.state.solver.symbolic(addr):
             return self._load_one_addr(
                 self.state.solver.eval(addr), True, addr, condition, size, read_value=None, **kwargs
             )
@@ -277,22 +277,19 @@ class AddressConcretizationMixin(MemoryMixin):
         except SimMemoryError:
             if options.CONSERVATIVE_READ_STRATEGY in self.state.options:
                 return self._default_value(None, size, name="symbolic_read_unconstrained", **kwargs)
-            else:
-                raise
+            raise
 
         # quick optimization so as to not involve the solver if not necessary
         trivial = len(concrete_addrs) == 1 and (addr == concrete_addrs[0]).is_true()
         if not trivial:
             # apply the concretization results to the state
             constraint_options = [addr == concrete_addr for concrete_addr in concrete_addrs]
-            conditional_constraint = self.state.solver.Or(*constraint_options)
+            conditional_constraint = claripy.Or(*constraint_options)
             self._add_constraints(conditional_constraint, condition=condition, **kwargs)
 
         # quick optimization to not introduce the DUMMY value if there's only one loop
-        if len(concrete_addrs) == 1:
-            read_value = None
-        else:
-            read_value = DUMMY_SYMBOLIC_READ_VALUE  # this is a sentinel value and should never be touched
+        # DUMMY_SYMBOLIC_READ_VALUE is a sentinel value and should never be touched
+        read_value = None if len(concrete_addrs) == 1 else DUMMY_SYMBOLIC_READ_VALUE
 
         for concrete_addr in concrete_addrs:
             # perform each of the loads
@@ -317,7 +314,7 @@ class AddressConcretizationMixin(MemoryMixin):
         if type(addr) is int:
             self._store_one_addr(addr, data, True, addr, condition, size, **kwargs)
             return
-        elif not self.state.solver.symbolic(addr):
+        if not self.state.solver.symbolic(addr):
             self._store_one_addr(self.state.solver.eval(addr), data, True, addr, condition, size, **kwargs)
             return
 
@@ -330,15 +327,14 @@ class AddressConcretizationMixin(MemoryMixin):
         except SimMemoryError:
             if options.CONSERVATIVE_WRITE_STRATEGY in self.state.options:
                 return  # not completed
-            else:
-                raise
+            raise
 
         # quick optimization so as to not involve the solver if not necessary
         trivial = len(concrete_addrs) == 1 and (addr == concrete_addrs[0]).is_true()
         if not trivial:
             # apply the concretization results to the state
             constraint_options = [addr == concrete_addr for concrete_addr in concrete_addrs]
-            conditional_constraint = self.state.solver.Or(*constraint_options)
+            conditional_constraint = claripy.Or(*constraint_options)
             self._add_constraints(conditional_constraint, condition=condition, **kwargs)
 
             if len(concrete_addrs) == 1:

angr/storage/memory_mixins/bvv_conversion_mixin.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 import claripy
 
@@ -50,25 +51,23 @@ class DataNormalizationMixin(MemoryMixin):
             thing = thing.encode("utf-8")
         if type(thing) in (bytes, bytearray, memoryview):
             return claripy.BVV(thing)
-        elif type(thing) is int:
+        if type(thing) is int:
             if bits is None:
                 l.warning("Unknown size for memory data %#x. Default to arch.bits.", thing)
                 bits = self.state.arch.bits
             return claripy.BVV(thing, bits)
-        elif type(thing) is float:
+        if type(thing) is float:
             if bits == 32:
                 return claripy.FPV(thing, claripy.FSORT_FLOAT).raw_to_bv()
-            elif bits == 64:
+            if bits == 64:
                 return claripy.FPV(thing, claripy.FSORT_DOUBLE).raw_to_bv()
-            else:
-                raise TypeError("Passed float size which is not a float or a double", size)
+            raise TypeError("Passed float size which is not a float or a double", size)
+        try:
+            raw_to_bv = thing.raw_to_bv
+        except AttributeError:
+            raise TypeError("Bad value passed to memory", thing) from None
         else:
-            try:
-                raw_to_bv = thing.raw_to_bv
-            except AttributeError:
-                raise TypeError("Bad value passed to memory", thing) from None
-            else:
-                return raw_to_bv()
+            return raw_to_bv()
 
 
 from ...errors import SimMemoryError

angr/storage/memory_mixins/clouseau_mixin.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from . import MemoryMixin
 
 

angr/storage/memory_mixins/conditional_store_mixin.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import claripy
 
 from . import MemoryMixin

angr/storage/memory_mixins/convenient_mappings_mixin.py

@@ -1,4 +1,5 @@
 # pylint:disable=arguments-differ,assignment-from-no-return,isinstance-second-argument-not-valid-type
+from __future__ import annotations
 import logging
 
 import claripy