angr 9.2.102__py3-none-win_amd64.whl → 9.2.103__py3-none-win_amd64.whl

angr/state_plugins/solver.py

@@ -1,7 +1,7 @@
 import functools
 import time
 import logging
-from typing import List, Type, TypeVar, overload, Optional, Union
+from typing import TypeVar, overload
 
 from claripy import backend_manager
 
@@ -774,9 +774,9 @@ class SimSolver(SimStatePlugin):
 
     @staticmethod
     def _cast_to(
-        e: Union[claripy.ast.Bool, claripy.ast.BV, claripy.ast.FP],
-        solution: Union[bool, float, int],
-        cast_to: Optional[Type[CastType]],
+        e: claripy.ast.Bool | claripy.ast.BV | claripy.ast.FP,
+        solution: bool | float | int,
+        cast_to: type[CastType] | None,
     ) -> CastType:
         """
         Casts a solution for the given expression to type `cast_to`.
@@ -813,22 +813,22 @@ class SimSolver(SimStatePlugin):
         return solution
 
     @overload
-    def eval_upto(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> List[int]: ...
+    def eval_upto(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> list[int]: ...
 
     @overload
-    def eval_upto(self, e: claripy.ast.BV, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_upto(self, e: claripy.ast.BV, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_upto(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> List[bool]: ...
+    def eval_upto(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> list[bool]: ...
 
     @overload
-    def eval_upto(self, e: claripy.ast.Bool, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_upto(self, e: claripy.ast.Bool, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_upto(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> List[float]: ...
+    def eval_upto(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> list[float]: ...
 
     @overload
-    def eval_upto(self, e: claripy.ast.FP, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_upto(self, e: claripy.ast.FP, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     def eval_upto(self, e, n, cast_to=None, **kwargs):
         """
@@ -856,19 +856,19 @@ class SimSolver(SimStatePlugin):
     def eval(self, e: claripy.ast.BV, cast_to: None = ..., **kwargs) -> int: ...
 
     @overload
-    def eval(self, e: claripy.ast.BV, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval(self, e: claripy.ast.BV, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     @overload
     def eval(self, e: claripy.ast.Bool, cast_to: None = ..., **kwargs) -> bool: ...
 
     @overload
-    def eval(self, e: claripy.ast.Bool, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval(self, e: claripy.ast.Bool, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     @overload
     def eval(self, e: claripy.ast.FP, cast_to: None = ..., **kwargs) -> float: ...
 
     @overload
-    def eval(self, e: claripy.ast.FP, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval(self, e: claripy.ast.FP, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     def eval(self, e, cast_to=None, **kwargs):
         """
@@ -893,19 +893,19 @@ class SimSolver(SimStatePlugin):
     def eval_one(self, e: claripy.ast.BV, cast_to: None = ..., **kwargs) -> int: ...
 
     @overload
-    def eval_one(self, e: claripy.ast.BV, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval_one(self, e: claripy.ast.BV, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     @overload
     def eval_one(self, e: claripy.ast.Bool, cast_to: None = ..., **kwargs) -> bool: ...
 
     @overload
-    def eval_one(self, e: claripy.ast.Bool, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval_one(self, e: claripy.ast.Bool, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     @overload
     def eval_one(self, e: claripy.ast.FP, cast_to: None = ..., **kwargs) -> float: ...
 
     @overload
-    def eval_one(self, e: claripy.ast.FP, cast_to: Type[CastType], **kwargs) -> CastType: ...
+    def eval_one(self, e: claripy.ast.FP, cast_to: type[CastType], **kwargs) -> CastType: ...
 
     def eval_one(self, e, cast_to=None, **kwargs):
         """
@@ -928,22 +928,22 @@ class SimSolver(SimStatePlugin):
             raise
 
     @overload
-    def eval_atmost(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> List[int]: ...
+    def eval_atmost(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> list[int]: ...
 
     @overload
-    def eval_atmost(self, e: claripy.ast.BV, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atmost(self, e: claripy.ast.BV, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_atmost(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> List[bool]: ...
+    def eval_atmost(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> list[bool]: ...
 
     @overload
-    def eval_atmost(self, e: claripy.ast.Bool, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atmost(self, e: claripy.ast.Bool, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_atmost(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> List[float]: ...
+    def eval_atmost(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> list[float]: ...
 
     @overload
-    def eval_atmost(self, e: claripy.ast.FP, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atmost(self, e: claripy.ast.FP, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     def eval_atmost(self, e, n, cast_to=None, **kwargs):
         """
@@ -964,22 +964,22 @@ class SimSolver(SimStatePlugin):
         return r
 
     @overload
-    def eval_atleast(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> List[int]: ...
+    def eval_atleast(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> list[int]: ...
 
     @overload
-    def eval_atleast(self, e: claripy.ast.BV, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atleast(self, e: claripy.ast.BV, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_atleast(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> List[bool]: ...
+    def eval_atleast(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> list[bool]: ...
 
     @overload
-    def eval_atleast(self, e: claripy.ast.Bool, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atleast(self, e: claripy.ast.Bool, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_atleast(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> List[float]: ...
+    def eval_atleast(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> list[float]: ...
 
     @overload
-    def eval_atleast(self, e: claripy.ast.FP, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_atleast(self, e: claripy.ast.FP, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     def eval_atleast(self, e, n, cast_to=None, **kwargs):
         """
@@ -999,22 +999,22 @@ class SimSolver(SimStatePlugin):
         return r
 
     @overload
-    def eval_exact(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> List[int]: ...
+    def eval_exact(self, e: claripy.ast.BV, n: int, cast_to: None = ..., **kwargs) -> list[int]: ...
 
     @overload
-    def eval_exact(self, e: claripy.ast.BV, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_exact(self, e: claripy.ast.BV, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_exact(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> List[bool]: ...
+    def eval_exact(self, e: claripy.ast.Bool, n: int, cast_to: None = ..., **kwargs) -> list[bool]: ...
 
     @overload
-    def eval_exact(self, e: claripy.ast.Bool, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_exact(self, e: claripy.ast.Bool, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     @overload
-    def eval_exact(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> List[float]: ...
+    def eval_exact(self, e: claripy.ast.FP, n: int, cast_to: None = ..., **kwargs) -> list[float]: ...
 
     @overload
-    def eval_exact(self, e: claripy.ast.FP, n: int, cast_to: Type[CastType], **kwargs) -> List[CastType]: ...
+    def eval_exact(self, e: claripy.ast.FP, n: int, cast_to: type[CastType], **kwargs) -> list[CastType]: ...
 
     def eval_exact(self, e, n, cast_to=None, **kwargs):
         """

angr/storage/memory_mixins/__init__.py

@@ -1,5 +1,6 @@
 # pylint:disable=abstract-method,wrong-import-position,unused-argument,missing-class-docstring,arguments-differ
-from typing import Iterable, Tuple, Dict, Any, Optional
+from typing import Tuple, Dict, Any, Optional
+from collections.abc import Iterable
 
 import claripy
 
@@ -118,7 +119,7 @@ class MemoryMixin(SimStatePlugin):
         The ``inspect``, ``events``, and ``key`` parameters are for ``state.solver.Unconstrained``, if it is used.
         """
 
-    def _merge_values(self, values: Iterable[Tuple[Any, Any]], merged_size: int, **kwargs) -> Optional[Any]:
+    def _merge_values(self, values: Iterable[tuple[Any, Any]], merged_size: int, **kwargs) -> Any | None:
         """
         Override this method to provide value merging support.
 
@@ -128,7 +129,7 @@ class MemoryMixin(SimStatePlugin):
         """
         raise NotImplementedError()
 
-    def _merge_labels(self, labels: Iterable[Dict], **kwargs) -> Optional[Dict]:
+    def _merge_labels(self, labels: Iterable[dict], **kwargs) -> dict | None:
         """
         Override this method to provide label merging support.
 

angr/storage/memory_mixins/actions_mixin.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from ...state_plugins.sim_action import SimActionData, SimActionObject
 from ... import sim_options as o
 from . import MemoryMixin
@@ -62,7 +60,7 @@ class ActionsMixinLow(MemoryMixin):
             action.actual_addrs.append(addr)
         return super().load(addr, action=action, **kwargs)
 
-    def store(self, addr, data, action: Optional[SimActionData] = None, **kwargs):
+    def store(self, addr, data, action: SimActionData | None = None, **kwargs):
         if action is not None:
             if action.actual_addrs is None:
                 action.actual_addrs = []

angr/storage/memory_mixins/address_concretization_mixin.py

@@ -1,5 +1,3 @@
-from typing import List
-
 import claripy
 
 from . import MemoryMixin
@@ -227,7 +225,7 @@ class AddressConcretizationMixin(MemoryMixin):
     #
 
     @staticmethod
-    def _interleave_ints(addrs: List[int]) -> List[int]:
+    def _interleave_ints(addrs: list[int]) -> list[int]:
         """
         Take a list of integers and return a new list of integers where front and back integers interleave.
         """

angr/storage/memory_mixins/convenient_mappings_mixin.py

@@ -1,5 +1,4 @@
 # pylint:disable=arguments-differ,assignment-from-no-return,isinstance-second-argument-not-valid-type
-from typing import Optional, Set
 import logging
 
 import claripy
@@ -20,7 +19,7 @@ class ConvenientMappingsMixin(MemoryMixin):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self._symbolic_addrs: Set = set()
+        self._symbolic_addrs: set = set()
         self._name_mapping = ChainMapCOW()
         self._hash_mapping = ChainMapCOW()
         self._updated_mappings = set()
@@ -116,7 +115,7 @@ class ConvenientMappingsMixin(MemoryMixin):
             d[m] = set()
         self._updated_mappings.add((m, id(d)))
 
-    def _update_mappings(self, actual_addr: int, old_obj: Optional[claripy.ast.BV], new_obj: claripy.ast.BV):
+    def _update_mappings(self, actual_addr: int, old_obj: claripy.ast.BV | None, new_obj: claripy.ast.BV):
         if options.MEMORY_SYMBOLIC_BYTES_MAP in self.state.options:
             if self.state.solver.symbolic(new_obj):
                 self._symbolic_addrs.add(actual_addr)
@@ -243,7 +242,7 @@ class ConvenientMappingsMixin(MemoryMixin):
 
         # Computer an intersection between sets of memory addresses for each unique variable name. The eventual address
         # set contains all addresses whose memory objects we should update.
-        addrs: Optional[Set] = None
+        addrs: set | None = None
         for v in old.variables:
             v: str
             if addrs is None:

angr/storage/memory_mixins/default_filler_mixin.py

@@ -120,7 +120,7 @@ class SpecialFillerMixin(MemoryMixin):
             and self.state._special_memory_filler is not None
             and type(addr) is int
         ):
-            return self.state._special_memory_filler(name, size * self.state.arch.byte_width, self.state)
+            return self.state._special_memory_filler(name, addr, size * self.state.arch.byte_width, self.state)
         return super()._default_value(addr, size, name=name, **kwargs)
 
     def copy(self, memo):

angr/storage/memory_mixins/label_merger_mixin.py

@@ -1,4 +1,4 @@
-from typing import Iterable, Dict, Optional
+from collections.abc import Iterable
 
 from . import MemoryMixin
 
@@ -11,7 +11,7 @@ class LabelMergerMixin(MemoryMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    def _merge_labels(self, labels: Iterable[Dict], **kwargs) -> Optional[Dict]:
+    def _merge_labels(self, labels: Iterable[dict], **kwargs) -> dict | None:
         new_label = {}
         all_keys = set()
         for label in labels:

angr/storage/memory_mixins/multi_value_merger_mixin.py

@@ -1,5 +1,6 @@
 # pylint:disable=missing-class-docstring
-from typing import Iterable, Tuple, Any, Callable, Optional
+from typing import Any
+from collections.abc import Iterable, Callable
 
 from . import MemoryMixin
 
@@ -12,11 +13,11 @@ class MultiValueMergerMixin(MemoryMixin):
         self._annotation_limit = annotation_limit
         self._top_func: Callable = top_func
         self._is_top_func: Callable = is_top_func
-        self._phi_maker: Optional[Callable] = phi_maker
+        self._phi_maker: Callable | None = phi_maker
 
         super().__init__(*args, **kwargs)
 
-    def _merge_values(self, values: Iterable[Tuple[Any, Any]], merged_size: int, **kwargs):
+    def _merge_values(self, values: Iterable[tuple[Any, Any]], merged_size: int, **kwargs):
         values_set = {v for v, _ in values}
         if self._phi_maker is not None:
             phi_var = self._phi_maker(values_set)

angr/storage/memory_mixins/paged_memory/page_backer_mixins.py

@@ -1,5 +1,6 @@
 from mmap import mmap
-from typing import Union, List, Generator, Tuple
+from typing import Union
+from collections.abc import Generator
 import logging
 
 import claripy
@@ -9,8 +10,8 @@ from .paged_memory_mixin import PagedMemoryMixin
 
 l = logging.getLogger(__name__)
 
-BackerType = Union[bytes, bytearray, List[int]]
-BackerIterType = Generator[Tuple[int, BackerType], None, None]
+BackerType = Union[bytes, bytearray, list[int]]
+BackerIterType = Generator[tuple[int, BackerType], None, None]
 
 
 # since memoryview isn't pickleable, we make do...
@@ -28,7 +29,7 @@ class NotMemoryview:
 
 
 class ClemoryBackerMixin(PagedMemoryMixin):
-    def __init__(self, cle_memory_backer: Union[None, cle.Loader, cle.Clemory] = None, **kwargs):
+    def __init__(self, cle_memory_backer: None | cle.Loader | cle.Clemory = None, **kwargs):
         super().__init__(**kwargs)
 
         if isinstance(cle_memory_backer, cle.Loader):
@@ -96,7 +97,7 @@ class ClemoryBackerMixin(PagedMemoryMixin):
             return self._data_from_lists_backer(addr, backer, backer_start, backer_iter)
         raise TypeError("Unsupported backer type %s." % type(backer))
 
-    def _calc_page_starts(self, addr: int, backer_start: int, backer_length: int) -> Tuple[int, int, int]:
+    def _calc_page_starts(self, addr: int, backer_start: int, backer_length: int) -> tuple[int, int, int]:
         # lord help me. why do I keep having to write code that looks like this
         # why have I found myself entangled in a briar patch of address spaces embedded in other address spaces
         if addr >= backer_start:
@@ -115,9 +116,9 @@ class ClemoryBackerMixin(PagedMemoryMixin):
     def _data_from_bytes_backer(
         self,
         addr: int,
-        backer: Union[bytes, bytearray],
+        backer: bytes | bytearray,
         backer_start: int,
-        backer_iter: Generator[Tuple[int, Union[bytes, bytearray]], None, None],
+        backer_iter: Generator[tuple[int, bytes | bytearray], None, None],
     ) -> claripy.ast.BV:
         if backer_start <= addr and backer_start + len(backer) >= addr + self.page_size:
             # fast case
@@ -144,7 +145,7 @@ class ClemoryBackerMixin(PagedMemoryMixin):
         return data
 
     def _data_from_lists_backer(
-        self, addr: int, backer: List[int], backer_start: int, backer_iter: Generator[Tuple[int, List[int]], None, None]
+        self, addr: int, backer: list[int], backer_start: int, backer_iter: Generator[tuple[int, list[int]], None, None]
     ) -> claripy.ast.BV:
         page_data = [0] * self.page_size
         while backer_start < addr + self.page_size:

angr/storage/memory_mixins/paged_memory/paged_memory_mixin.py

@@ -1,5 +1,6 @@
 import cffi
-from typing import Tuple, Type, Dict, Optional, Iterable, Set, Any
+from typing import Any
+from collections.abc import Iterable
 import logging
 from collections import defaultdict
 
@@ -22,7 +23,7 @@ class PagedMemoryMixin(MemoryMixin):
     """
 
     SUPPORTS_CONCRETE_LOAD = True
-    PAGE_TYPE: Type[PageType] = None  # must be provided in subclass
+    PAGE_TYPE: type[PageType] = None  # must be provided in subclass
 
     def __init__(self, page_size=0x1000, default_permissions=3, permissions_map=None, page_kwargs=None, **kwargs):
         super().__init__(**kwargs)
@@ -31,7 +32,7 @@ class PagedMemoryMixin(MemoryMixin):
 
         self._permissions_map = permissions_map if permissions_map is not None else {}
         self._default_permissions = default_permissions
-        self._pages: Dict[int, Optional[PageType]] = {}
+        self._pages: dict[int, PageType | None] = {}
 
     @MemoryMixin.memo
     def copy(self, memo):
@@ -105,7 +106,7 @@ class PagedMemoryMixin(MemoryMixin):
             memory=self, memory_id="%s_%d" % (self.id, pageno), permissions=permissions, **self._extra_page_kwargs
         )
 
-    def _divide_addr(self, addr: int) -> Tuple[int, int]:
+    def _divide_addr(self, addr: int) -> tuple[int, int]:
         return divmod(addr, self.page_size)
 
     def load(self, addr: int, size: int = None, endness=None, **kwargs):
@@ -252,7 +253,7 @@ class PagedMemoryMixin(MemoryMixin):
             pageoff = 0
 
     def merge(self, others: Iterable["PagedMemoryMixin"], merge_conditions, common_ancestor=None) -> bool:
-        changed_pages_and_offsets: Dict[int, Optional[Set[int]]] = {}
+        changed_pages_and_offsets: dict[int, set[int] | None] = {}
         for o in others:
             for changed_page, changed_offsets in self.changed_pages(o).items():
                 if changed_offsets is None:
@@ -295,7 +296,7 @@ class PagedMemoryMixin(MemoryMixin):
         return bool(merged_bytes)
 
     def compare(self, other: "PagedMemoryMixin") -> bool:
-        changed_pages_and_offsets: Dict[int, Optional[Set[int]]] = dict(self.changed_pages(other))
+        changed_pages_and_offsets: dict[int, set[int] | None] = dict(self.changed_pages(other))
 
         for page_no in sorted(changed_pages_and_offsets):
             page = self._get_page(page_no, False)
@@ -555,7 +556,7 @@ class PagedMemoryMixin(MemoryMixin):
 
         return data
 
-    def changed_bytes(self, other) -> Set[int]:
+    def changed_bytes(self, other) -> set[int]:
         my_pages = set(self._pages)
         other_pages = set(other._pages)
         intersection = my_pages.intersection(other_pages)
@@ -583,12 +584,12 @@ class PagedMemoryMixin(MemoryMixin):
 
         return changes
 
-    def changed_pages(self, other) -> Dict[int, Optional[Set[int]]]:
+    def changed_pages(self, other) -> dict[int, set[int] | None]:
         my_pages = set(self._pages)
         other_pages = set(other._pages)
         intersection = my_pages.intersection(other_pages)
         difference = my_pages.symmetric_difference(other_pages)
-        changes: Dict[int, Optional[Set[int]]] = {d: None for d in difference}
+        changes: dict[int, set[int] | None] = {d: None for d in difference}
 
         for pageno in intersection:
             my_page = self._pages[pageno]
@@ -608,7 +609,7 @@ class PagedMemoryMixin(MemoryMixin):
         return changes
 
     def _replace_all(self, addrs: Iterable[int], old: claripy.ast.BV, new: claripy.ast.BV):
-        page_offsets: Dict[Set[int]] = defaultdict(set)
+        page_offsets: dict[set[int]] = defaultdict(set)
         for addr in addrs:
             page_no, page_offset = self._divide_addr(addr)
             page_offsets[page_no].add(page_offset)
@@ -657,7 +658,7 @@ class PagedMemoryMixin(MemoryMixin):
 class LabeledPagesMixin(PagedMemoryMixin):
     def load_with_labels(
         self, addr: int, size: int = None, endness=None, **kwargs
-    ) -> Tuple[claripy.ast.Base, Tuple[Tuple[int, int, int, Any]]]:
+    ) -> tuple[claripy.ast.Base, tuple[tuple[int, int, int, Any]]]:
         if endness is None:
             endness = self.endness
 

angr/storage/memory_mixins/paged_memory/pages/cooperation.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple, Set, Dict, Union, Optional, Any
+from typing import Any
 
 import claripy
 
@@ -19,7 +19,7 @@ class CooperationBase:
         """
 
     @classmethod
-    def _decompose_objects(cls, addr, data, endness, **kwargs) -> Tuple[Any, int, int]:
+    def _decompose_objects(cls, addr, data, endness, **kwargs) -> tuple[Any, int, int]:
         """
         A bidirectional generator. No idea if this is overengineered. Usage is that you send it a size to use
         and it yields a tuple of three elements: the object to store for the next n bytes, the base address of the
@@ -58,11 +58,11 @@ class MemoryObjectMixin(CooperationBase):
     @classmethod
     def _compose_objects(
         cls,
-        objects: List[List[Tuple[int, SimMemoryObject]]],
+        objects: list[list[tuple[int, SimMemoryObject]]],
         size,
         endness=None,
         memory=None,
-        labels: Optional[List] = None,
+        labels: list | None = None,
         **kwargs,
     ):
         c_objects = []
@@ -168,16 +168,16 @@ class MemoryObjectSetMixin(CooperationBase):
 
     @classmethod
     def _compose_objects(
-        cls, objects: List[List[Tuple[int, Set[SimMemoryObject]]]], size, endness=None, memory=None, **kwargs
+        cls, objects: list[list[tuple[int, set[SimMemoryObject]]]], size, endness=None, memory=None, **kwargs
     ):
-        c_objects: List[Tuple[int, Union[SimMemoryObject, Set[SimMemoryObject]]]] = []
+        c_objects: list[tuple[int, SimMemoryObject | set[SimMemoryObject]]] = []
         for objlist in objects:
             for element in objlist:
                 if not c_objects or element[1] is not c_objects[-1][1]:
                     c_objects.append(element)
 
         mask = (1 << memory.state.arch.bits) - 1
-        elements: List[Set[claripy.ast.Base]] = []
+        elements: list[set[claripy.ast.Base]] = []
         for i, (a, objs) in enumerate(c_objects):
             chopped_set = set()
             if type(objs) is not set:
@@ -245,7 +245,7 @@ class MemoryObjectSetMixin(CooperationBase):
             assert label is None  # TODO: Support labels
 
             size = yield
-            offset_to_mos: Dict[int, Set[SimMemoryObject]] = {}
+            offset_to_mos: dict[int, set[SimMemoryObject]] = {}
             for offset, vs in data.items():
                 offset_to_mos[offset] = set()
                 for v in vs:

angr/storage/memory_mixins/paged_memory/pages/history_tracking_mixin.py

@@ -1,5 +1,4 @@
 # pylint:disable=arguments-differ,unused-argument,no-member
-from typing import Set, Optional
 
 from angr.storage.memory_mixins import MemoryMixin
 from angr.utils.segment_list import SegmentList
@@ -50,8 +49,8 @@ class HistoryTrackingMixin(RefcountMixin, MemoryMixin):
             yield parent
             parent = parent._parent
 
-    def changed_bytes(self, other, **kwargs) -> Optional[Set[int]]:
-        candidates: Set[int] = set()
+    def changed_bytes(self, other, **kwargs) -> set[int] | None:
+        candidates: set[int] = set()
 
         self_history_list = [self] + list(self.parents())
         other_history_list = [other] + list(other.parents())

angr/storage/memory_mixins/paged_memory/pages/list_page.py

@@ -1,6 +1,5 @@
 # pylint:disable=abstract-method,arguments-differ
 import logging
-from typing import Optional, List, Set, Tuple
 
 import claripy
 
@@ -21,16 +20,16 @@ class ListPage(MemoryObjectMixin, PageBase):
     def __init__(self, memory=None, content=None, sinkhole=None, mo_cmp=None, **kwargs):
         super().__init__(**kwargs)
 
-        self.content: Optional[DynamicDictList[Optional[SimMemoryObject]]] = (
+        self.content: DynamicDictList[SimMemoryObject | None] | None = (
             DynamicDictList(max_size=memory.page_size, content=content) if content is not None else None
         )
         self.stored_offset = set()
         if self.content is None:
             if memory is not None:
-                self.content: DynamicDictList[Optional[SimMemoryObject]] = DynamicDictList(max_size=memory.page_size)
+                self.content: DynamicDictList[SimMemoryObject | None] = DynamicDictList(max_size=memory.page_size)
         self._mo_cmp = mo_cmp
 
-        self.sinkhole: Optional[SimMemoryObject] = sinkhole
+        self.sinkhole: SimMemoryObject | None = sinkhole
 
     def copy(self, memo):
         o = super().copy(memo)
@@ -114,19 +113,19 @@ class ListPage(MemoryObjectMixin, PageBase):
 
     def merge(
         self,
-        others: List["ListPage"],
+        others: list["ListPage"],
         merge_conditions,
         common_ancestor=None,
         page_addr: int = None,
         memory=None,
-        changed_offsets: Optional[Set[int]] = None,
+        changed_offsets: set[int] | None = None,
     ):
         if changed_offsets is None:
             changed_offsets = set()
             for other in others:
                 changed_offsets |= self.changed_bytes(other, page_addr)
 
-        all_pages: List["ListPage"] = [self] + others
+        all_pages: list["ListPage"] = [self] + others
         if merge_conditions is None:
             merge_conditions = [None] * len(all_pages)
 
@@ -244,7 +243,7 @@ class ListPage(MemoryObjectMixin, PageBase):
     def changed_bytes(self, other: "ListPage", page_addr: int = None):
         candidates = super().changed_bytes(other)
         if candidates is None:
-            candidates: Set[int] = set()
+            candidates: set[int] = set()
             if self.sinkhole is None:
                 candidates |= self.stored_offset
             else:
@@ -260,7 +259,7 @@ class ListPage(MemoryObjectMixin, PageBase):
                         candidates.add(i)
 
         byte_width = 8  # TODO: Introduce self.state if we want to use self.state.arch.byte_width
-        differences: Set[int] = set()
+        differences: set[int] = set()
         for c in candidates:
             s_contains = self._contains(c, page_addr)
             o_contains = other._contains(c, page_addr)
@@ -331,14 +330,14 @@ class ListPage(MemoryObjectMixin, PageBase):
         return new_mo
 
     @staticmethod
-    def _resolve_range(mo: SimMemoryObject, page_addr: int, page_size) -> Tuple[int, int]:
+    def _resolve_range(mo: SimMemoryObject, page_addr: int, page_size) -> tuple[int, int]:
         start = max(mo.base, page_addr)
         end = min(mo.last_addr + 1, page_addr + page_size)
         if end <= start:
             l.warning("Nothing left of the memory object to store in SimPage.")
         return start, end
 
-    def _get_object(self, start: int, page_addr: int) -> Optional[SimMemoryObject]:
+    def _get_object(self, start: int, page_addr: int) -> SimMemoryObject | None:
         mo = self.content[start]
         if mo is None:
             return None