angr 9.2.158__cp310-abi3-macosx_11_0_arm64.whl → 9.2.159__cp310-abi3-macosx_11_0_arm64.whl

angr/analyses/decompiler/peephole_optimizations/one_sub_bool.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const, UnaryOp
+from angr.ailment.expression import Convert, BinaryOp, Const, UnaryOp
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_cascading_conversions.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const
+from angr.ailment.expression import Convert, BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_cxx_destructor_calls.py

@@ -1,8 +1,8 @@
 # pylint:disable=arguments-differ
 from __future__ import annotations
 
-from ailment.expression import Const
-from ailment.statement import Call
+from angr.ailment.expression import Const
+from angr.ailment.statement import Call
 
 from .base import PeepholeOptimizationStmtBase
 

angr/analyses/decompiler/peephole_optimizations/remove_empty_if_body.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ailment.statement import ConditionalJump
-from ailment.expression import ITE, UnaryOp
+from angr.ailment.statement import ConditionalJump
+from angr.ailment.expression import ITE, UnaryOp
 
 from .base import PeepholeOptimizationStmtBase
 

angr/analyses/decompiler/peephole_optimizations/remove_noop_conversions.py

@@ -1,6 +1,6 @@
 # pylint: disable=missing-class-docstring,no-self-use
 from __future__ import annotations
-from ailment.expression import Convert
+from angr.ailment.expression import Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_bitmasks.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Convert, Const, ITE
+from angr.ailment.expression import BinaryOp, Convert, Const, ITE
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_conversions.py

@@ -1,6 +1,6 @@
 # pylint: disable=missing-class-docstring,too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import BinaryOp, Convert, Const
+from angr.ailment.expression import BinaryOp, Convert, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_ite_branch.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import ITE, BinaryOp
+from angr.ailment.expression import ITE, BinaryOp
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_ite_comparisons.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import ITE, BinaryOp, UnaryOp, Const
+from angr.ailment.expression import ITE, BinaryOp, UnaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_nots.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from ailment.expression import BinaryOp, UnaryOp
+from angr.ailment.expression import BinaryOp, UnaryOp
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_reinterprets.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import struct
 
-from ailment.expression import Reinterpret, Const
+from angr.ailment.expression import Reinterpret, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/remove_redundant_shifts.py

@@ -1,6 +1,6 @@
 # pylint:disable=no-self-use,too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 from .utils import get_expr_shift_left_amount

angr/analyses/decompiler/peephole_optimizations/remove_redundant_shifts_around_comparators.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/rewrite_bit_extractions.py

@@ -1,6 +1,6 @@
 # pylint:disable=too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import Expression, BinaryOp, Const, Convert, ITE
+from angr.ailment.expression import Expression, BinaryOp, Const, Convert, ITE
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/rewrite_conv_mul.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Convert
+from angr.ailment.expression import BinaryOp, Const, Convert
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/rewrite_cxx_operator_calls.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 
 from archinfo import Endness
-from ailment.constant import UNDETERMINED_SIZE
-from ailment.expression import Const, VirtualVariable, BinaryOp, UnaryOp, Load
-from ailment.statement import Call, WeakAssignment
+from angr.ailment.constant import UNDETERMINED_SIZE
+from angr.ailment.expression import Const, VirtualVariable, BinaryOp, UnaryOp, Load
+from angr.ailment.statement import Call, WeakAssignment
 
 from angr.sim_type import SimTypeReference, SimCppClass
 from angr.knowledge_plugins.key_definitions import atoms

angr/analyses/decompiler/peephole_optimizations/rewrite_mips_gp_loads.py

@@ -1,6 +1,6 @@
 # pylint:disable=too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import Load, BinaryOp, VirtualVariable, Const
+from angr.ailment.expression import Load, BinaryOp, VirtualVariable, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/rol_ror.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
-from ailment.statement import Assignment
-from ailment.expression import BinaryOp, Const, Tmp
+from angr.ailment.statement import Assignment
+from angr.ailment.expression import BinaryOp, Const, Tmp
 
 from .base import PeepholeOptimizationStmtBase
 from .utils import get_expr_shift_left_amount

angr/analyses/decompiler/peephole_optimizations/sar_to_signed_div.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const, ITE, Expression, VirtualVariable
+from angr.ailment.expression import Convert, BinaryOp, Const, ITE, Expression, VirtualVariable
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/shl_to_mul.py

@@ -1,6 +1,6 @@
 # pylint:disable=missing-class-docstring,no-self-use
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/simplify_pc_relative_loads.py

@@ -1,6 +1,6 @@
 # pylint:disable=too-many-boolean-expressions
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const, Load
+from angr.ailment.expression import BinaryOp, Const, Load
 
 from angr.utils.loader import is_pc, is_in_readonly_section, is_in_readonly_segment
 from .base import PeepholeOptimizationExprBase

angr/analyses/decompiler/peephole_optimizations/single_bit_cond_to_boolexpr.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import ITE, Convert, BinaryOp, Const
+from angr.ailment.expression import ITE, Convert, BinaryOp, Const
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/single_bit_xor.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import Convert, BinaryOp, Const, UnaryOp
+from angr.ailment.expression import Convert, BinaryOp, Const, UnaryOp
 
 from .base import PeepholeOptimizationExprBase
 

angr/analyses/decompiler/peephole_optimizations/tidy_stack_addr.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from ailment.expression import UnaryOp, BinaryOp, StackBaseOffset, Const
+from angr.ailment.expression import UnaryOp, BinaryOp, StackBaseOffset, Const
 
 from .base import PeepholeOptimizationExprBase
 
 if TYPE_CHECKING:
-    from ailment.expression import Expression
+    from angr.ailment.expression import Expression
 
 
 class TidyStackAddr(PeepholeOptimizationExprBase):

angr/analyses/decompiler/peephole_optimizations/utils.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment.expression import BinaryOp, Const
+from angr.ailment.expression import BinaryOp, Const
 
 
 def get_expr_shift_left_amount(expr: BinaryOp) -> int | None:

angr/analyses/decompiler/redundant_label_remover.py

@@ -1,7 +1,7 @@
 # pylint:disable=unused-argument
 from __future__ import annotations
 
-import ailment
+import angr.ailment as ailment
 
 from .sequence_walker import SequenceWalker
 from .structuring.structurer_nodes import SequenceNode

angr/analyses/decompiler/region_identifier.py

@@ -6,10 +6,10 @@ import logging
 
 import networkx
 
-import ailment
-from ailment import Block
-from ailment.statement import ConditionalJump, Jump
-from ailment.expression import Const
+import angr.ailment as ailment
+from angr.ailment import Block
+from angr.ailment.statement import ConditionalJump, Jump
+from angr.ailment.expression import Const
 
 from angr.utils.graph import GraphUtils
 from angr.utils.graph import dfs_back_edges, subgraph_between_nodes, dominates

angr/analyses/decompiler/region_simplifiers/cascading_cond_transformer.py

@@ -1,7 +1,7 @@
 # pylint:disable=no-self-use,arguments-renamed,isinstance-second-argument-not-valid-type
 from __future__ import annotations
 
-import ailment
+import angr.ailment as ailment
 import claripy
 
 from angr.analyses.decompiler.structuring.structurer_nodes import ConditionNode, CascadingConditionNode

angr/analyses/decompiler/region_simplifiers/cascading_ifs.py

@@ -1,6 +1,6 @@
 # pylint:disable=unused-argument,arguments-differ
 from __future__ import annotations
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from angr.analyses.decompiler.structuring.structurer_nodes import (

angr/analyses/decompiler/region_simplifiers/expr_folding.py

@@ -4,10 +4,10 @@ from collections import defaultdict
 from collections.abc import Iterable
 from typing import Any, TYPE_CHECKING
 
-import ailment
-from ailment import Expression, Block, AILBlockWalker
-from ailment.expression import ITE, Load
-from ailment.statement import Statement, Assignment, Call, Return
+from angr import ailment
+from angr.ailment import Expression, Block, AILBlockWalker
+from angr.ailment.expression import ITE, Load
+from angr.ailment.statement import Statement, Assignment, Call, Return
 
 from angr.utils.ail import is_phi_assignment
 from angr.utils.ssa import VVarUsesCollector
@@ -17,11 +17,12 @@ from angr.analyses.decompiler.structuring.structurer_nodes import (
     ConditionalBreakNode,
     LoopNode,
     CascadingConditionNode,
+    SequenceNode,
     SwitchCaseNode,
 )
 
 if TYPE_CHECKING:
-    from ailment.expression import MultiStatementExpression
+    from angr.ailment.expression import MultiStatementExpression
 
 
 class LocationBase:
@@ -156,6 +157,26 @@ class ConditionalBreakLocation(LocationBase):
         return isinstance(other, ConditionalBreakLocation) and self.node_addr == other.node_addr
 
 
+class LoopNodeFinder(SequenceWalker):
+    """
+    Returns all loops in a given region.
+    """
+
+    def __init__(self, node: SequenceNode):
+        handlers = {
+            LoopNode: self._handle_Loop,
+        }
+        super().__init__(handlers, update_seqnode_in_place=False, force_forward_scan=True)
+        self.loop_nodes: list[LoopNode] = []
+
+        self.walk(node)
+
+    def _handle_Loop(self, node: LoopNode, **kwargs):
+        super()._handle_Loop(node, **kwargs)
+        self.loop_nodes.append(node)
+        return None
+
+
 class MultiStatementExpressionAssignmentFinder(AILBlockWalker):
     """
     Process statements in MultiStatementExpression objects and find assignments.
@@ -345,7 +366,8 @@ class ExpressionCounter(SequenceWalker):
         if node.condition is not None:
             self._collect_assignments(node.condition, node)
             self._collect_uses(node.condition, ConditionLocation(node.addr))
-        return super()._handle_Loop(node, **kwargs)
+        # we do not go ahead and collect into the loop body
+        return None
 
     def _handle_SwitchCase(self, node: SwitchCaseNode, **kwargs):
         self._collect_uses(node.switch_expr, ConditionLocation(node.addr))
@@ -419,11 +441,16 @@ class InterferenceChecker(SequenceWalker):
             # special case: we process the call arguments first, then the call itself. this is to allow more expression
             # folding opportunities.
             the_call = None
-            if isinstance(stmt, Assignment) and isinstance(stmt.src, ailment.Stmt.Call):
+            if (
+                isinstance(stmt, Assignment)
+                and isinstance(stmt.src, ailment.Stmt.Call)
+                and not isinstance(stmt.src.target, str)
+            ):
                 the_call = stmt.src
             elif isinstance(stmt, ailment.Stmt.Call) and not isinstance(stmt.target, str):
                 the_call = stmt
             if the_call is not None:
+                assert isinstance(the_call.target, ailment.Stmt.Expression)
                 spotter.walk_expression(the_call.target)
                 if the_call.args:
                     for arg in the_call.args:
@@ -614,6 +641,7 @@ class ExpressionFolder(SequenceWalker):
             ConditionNode: self._handle_Condition,
             ConditionalBreakNode: self._handle_ConditionalBreak,
             SwitchCaseNode: self._handle_SwitchCase,
+            LoopNode: self._handle_Loop,
         }
 
         super().__init__(handlers)
@@ -693,7 +721,8 @@ class ExpressionFolder(SequenceWalker):
             if r is not None and r is not node.condition:
                 node.condition = r
 
-        return super()._handle_Loop(node, **kwargs)
+        # again, do not replace into the loop body
+        return None
 
     def _handle_SwitchCase(self, node: SwitchCaseNode, **kwargs):
         replacer = ExpressionReplacer(self._assignments, self._uses)

angr/analyses/decompiler/region_simplifiers/goto.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from angr.analyses.decompiler.structuring.structurer_nodes import (

angr/analyses/decompiler/region_simplifiers/if_.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from angr.analyses.decompiler.structuring.structurer_nodes import (

angr/analyses/decompiler/region_simplifiers/loop.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 from collections import defaultdict
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.condition_processor import ConditionProcessor, EmptyBlockNotice
 from angr.analyses.decompiler.sequence_walker import SequenceWalker

angr/analyses/decompiler/region_simplifiers/node_address_finder.py

@@ -1,7 +1,7 @@
 # pylint:disable=unused-argument,arguments-differ
 from __future__ import annotations
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 

angr/analyses/decompiler/region_simplifiers/region_simplifier.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.goto_manager import GotoManager
 from angr.analyses import AnalysesHub
@@ -7,6 +7,7 @@ from angr.analyses.analysis import Analysis
 from angr.analyses.decompiler.empty_node_remover import EmptyNodeRemover
 from angr.analyses.decompiler.jump_target_collector import JumpTargetCollector
 from angr.analyses.decompiler.redundant_label_remover import RedundantLabelRemover
+from angr.analyses.decompiler.structuring.structurer_nodes import LoopNode
 from .goto import GotoSimplifier
 from .if_ import IfSimplifier
 from .cascading_ifs import CascadingIfsRemover
@@ -18,6 +19,7 @@ from .expr_folding import (
     StoreStatementFinder,
     ExpressionLocation,
     InterferenceChecker,
+    LoopNodeFinder,
 )
 from .cascading_cond_transformer import CascadingConditionTransformer
 from .switch_expr_simplifier import SwitchExpressionSimplifier
@@ -44,7 +46,7 @@ class RegionSimplifier(Analysis):
         self._should_simplify_ifelses = simplify_ifelse
 
         self.goto_manager: GotoManager | None = None
-        self.result = None
+        self.result = self.region
 
         self._simplify()
 
@@ -101,6 +103,16 @@ class RegionSimplifier(Analysis):
     #
 
     def _fold_oneuse_expressions(self, region):
+        loop_nodes = LoopNodeFinder(region).loop_nodes
+        for sub_region in [*loop_nodes, region]:
+            # fold one-use expressions in each sub-region
+            if isinstance(sub_region, LoopNode):
+                self._fold_oneuse_expressions_in_region(sub_region.sequence_node)
+            else:
+                self._fold_oneuse_expressions_in_region(sub_region)
+        return region
+
+    def _fold_oneuse_expressions_in_region(self, region):
         # pylint:disable=unreachable
         expr_counter = ExpressionCounter(region)
 

angr/analyses/decompiler/region_simplifiers/switch_cluster_simplifier.py

@@ -4,9 +4,9 @@ import enum
 from typing import Any
 from collections import OrderedDict, defaultdict
 
-import ailment
-from ailment import UnaryOp
-from ailment.expression import negate
+import angr.ailment as ailment
+from angr.ailment import UnaryOp
+from angr.ailment.expression import negate
 
 from angr.utils.constants import SWITCH_MISSING_DEFAULT_NODE_ADDR
 from angr.analyses.decompiler.structuring.structurer_nodes import (

angr/analyses/decompiler/region_simplifiers/switch_expr_simplifier.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 from collections import OrderedDict
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses.decompiler.structuring.structurer_nodes import SwitchCaseNode
 from angr.analyses.decompiler.sequence_walker import SequenceWalker

angr/analyses/decompiler/return_maker.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.sim_type import SimTypeBottom
 from angr.calling_conventions import SimRegArg

angr/analyses/decompiler/seq_to_blocks.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from ailment import Block
+from angr.ailment import Block
 
 from .sequence_walker import SequenceWalker
 

angr/analyses/decompiler/sequence_walker.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 from collections import OrderedDict
 
-import ailment
+import angr.ailment as ailment
 
 from angr.errors import UnsupportedNodeTypeError
 from .structuring.structurer_nodes import (
@@ -180,7 +180,7 @@ class SequenceWalker:
 
         return None
 
-    def _handle_Loop(self, node: LoopNode, **kwargs):
+    def _handle_Loop(self, node: LoopNode, **kwargs) -> LoopNode | None:
         new_initializer = self._handle(node.initializer) if node.initializer is not None else None
         new_iterator = self._handle(node.iterator) if node.iterator is not None else None
         new_condition = (

angr/analyses/decompiler/ssailification/rewriting.py

@@ -6,10 +6,10 @@ import logging
 
 import networkx
 
-import ailment
-from ailment import Block
-from ailment.expression import Phi, VirtualVariable, VirtualVariableCategory
-from ailment.statement import Assignment, Label
+import angr.ailment as ailment
+from angr.ailment import Block
+from angr.ailment.expression import Phi, VirtualVariable, VirtualVariableCategory
+from angr.ailment.statement import Assignment, Label
 
 from angr.code_location import CodeLocation
 from angr.analyses import ForwardAnalysis

angr/analyses/decompiler/ssailification/rewriting_engine.py

@@ -4,9 +4,9 @@ from typing import Literal
 import logging
 
 from archinfo import Endness
-from ailment.block import Block
-from ailment.manager import Manager
-from ailment.statement import (
+from angr.ailment.block import Block
+from angr.ailment.manager import Manager
+from angr.ailment.statement import (
     Statement,
     Assignment,
     CAS,
@@ -18,7 +18,7 @@ from ailment.statement import (
     Jump,
     WeakAssignment,
 )
-from ailment.expression import (
+from angr.ailment.expression import (
     Atom,
     Expression,
     Register,

angr/analyses/decompiler/ssailification/rewriting_state.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 from collections import defaultdict
 
-from ailment.statement import Statement
-from ailment.expression import VirtualVariable
-from ailment.block import Block
+from angr.ailment.statement import Statement
+from angr.ailment.expression import VirtualVariable
+from angr.ailment.block import Block
 
 from angr.code_location import CodeLocation
 

angr/analyses/decompiler/ssailification/ssailification.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from itertools import count
 from bisect import bisect_left
 
-from ailment.expression import (
+from angr.ailment.expression import (
     Expression,
     Register,
     StackBaseOffset,
@@ -14,7 +14,7 @@ from ailment.expression import (
     VirtualVariableCategory,
     Load,
 )
-from ailment.statement import Statement, Store
+from angr.ailment.statement import Statement, Store
 
 from angr.knowledge_plugins.functions import Function
 from angr.code_location import CodeLocation

angr/analyses/decompiler/ssailification/traversal.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import logging
 
-import ailment
+import angr.ailment as ailment
 
 from angr.analyses import ForwardAnalysis
 from angr.analyses.forward_analysis import FunctionGraphVisitor

angr/analyses/decompiler/ssailification/traversal_engine.py

@@ -1,8 +1,17 @@
 from __future__ import annotations
 from collections import OrderedDict
 
-from ailment.statement import Call, Store, ConditionalJump, CAS
-from ailment.expression import Register, BinaryOp, StackBaseOffset, ITE, VEXCCallExpression, Tmp, DirtyExpression, Load
+from angr.ailment.statement import Call, Store, ConditionalJump, CAS
+from angr.ailment.expression import (
+    Register,
+    BinaryOp,
+    StackBaseOffset,
+    ITE,
+    VEXCCallExpression,
+    Tmp,
+    DirtyExpression,
+    Load,
+)
 
 from angr.engines.light import SimEngineLightAIL
 from angr.project import Project

angr/analyses/decompiler/structured_codegen/c.py

@@ -7,9 +7,9 @@ import logging
 import struct
 import re
 
-from ailment import Block, Expr, Stmt, Tmp
-from ailment.constant import UNDETERMINED_SIZE
-from ailment.expression import StackBaseOffset, BinaryOp
+from angr.ailment import Block, Expr, Stmt, Tmp
+from angr.ailment.constant import UNDETERMINED_SIZE
+from angr.ailment.expression import StackBaseOffset, BinaryOp
 from unique_log_filter import UniqueLogFilter
 
 from angr.sim_type import (