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

angr/analyses/decompiler/optimization_passes/optimization_pass.py

@@ -100,34 +100,6 @@ class BaseOptimizationPass:
         """
         raise NotImplementedError
 
-    def _simplify_graph(self, graph):
-        MAX_SIMP_ITERATION = 8
-        for _ in range(MAX_SIMP_ITERATION):
-            simp = self.project.analyses.AILSimplifier(
-                self._func,
-                func_graph=graph,
-                use_callee_saved_regs_at_return=False,
-                gp=self._func.info.get("gp", None) if self.project.arch.name in {"MIPS32", "MIPS64"} else None,
-            )
-            if simp.simplified:
-                graph = simp.func_graph
-            else:
-                break
-        else:
-            _l.warning("Failed to reach fixed point after %s simplification iterations.", MAX_SIMP_ITERATION)
-        return graph
-
-    def _recover_regions(self, graph: networkx.DiGraph, condition_processor=None, update_graph: bool = False):
-        return self.project.analyses[RegionIdentifier].prep(kb=self.kb)(
-            self._func,
-            graph=graph,
-            cond_proc=condition_processor or ConditionProcessor(self.project.arch),
-            update_graph=update_graph,
-            # TODO: find a way to pass Phoenix/DREAM options here (see decompiler.py for correct use)
-            force_loop_single_exit=True,
-            complete_successors=False,
-        )
-
 
 class OptimizationPass(BaseOptimizationPass):
     """
@@ -144,6 +116,7 @@ class OptimizationPass(BaseOptimizationPass):
         region_identifier=None,
         reaching_definitions=None,
         vvar_id_start=None,
+        entry_node_addr=None,
         **kwargs,
     ):
         super().__init__(func)
@@ -156,6 +129,9 @@ class OptimizationPass(BaseOptimizationPass):
         self._rd = reaching_definitions
         self._new_block_addrs = set()
         self.vvar_id_start = vvar_id_start
+        self.entry_node_addr: tuple[int, int | None] = (
+            entry_node_addr if entry_node_addr is not None else (func.addr, None)
+        )
 
         # output
         self.out_graph: networkx.DiGraph | None = None
@@ -254,6 +230,35 @@ class OptimizationPass(BaseOptimizationPass):
     def _is_sub(expr):
         return isinstance(expr, ailment.Expr.BinaryOp) and expr.op == "Sub"
 
+    def _simplify_graph(self, graph):
+        MAX_SIMP_ITERATION = 8
+        for _ in range(MAX_SIMP_ITERATION):
+            simp = self.project.analyses.AILSimplifier(
+                self._func,
+                func_graph=graph,
+                use_callee_saved_regs_at_return=False,
+                gp=self._func.info.get("gp", None) if self.project.arch.name in {"MIPS32", "MIPS64"} else None,
+            )
+            if simp.simplified:
+                graph = simp.func_graph
+            else:
+                break
+        else:
+            _l.warning("Failed to reach fixed point after %s simplification iterations.", MAX_SIMP_ITERATION)
+        return graph
+
+    def _recover_regions(self, graph: networkx.DiGraph, condition_processor=None, update_graph: bool = False):
+        return self.project.analyses[RegionIdentifier].prep(kb=self.kb)(
+            self._func,
+            graph=graph,
+            cond_proc=condition_processor or ConditionProcessor(self.project.arch),
+            update_graph=update_graph,
+            # TODO: find a way to pass Phoenix/DREAM options here (see decompiler.py for correct use)
+            force_loop_single_exit=True,
+            complete_successors=False,
+            entry_node_addr=self.entry_node_addr,
+        )
+
 
 class SequenceOptimizationPass(BaseOptimizationPass):
     """
@@ -424,6 +429,7 @@ class StructuringOptimizationPass(OptimizationPass):
             cond_proc=self._ri.cond_proc,
             force_loop_single_exit=False,
             complete_successors=True,
+            entry_node_addr=self.entry_node_addr,
         )
         if self._ri is None:
             return False

angr/analyses/decompiler/optimization_passes/register_save_area_simplifier.py

@@ -5,8 +5,8 @@ import logging
 import archinfo
 import ailment
 
-from ....calling_conventions import SimRegArg
-from ....code_location import CodeLocation
+from angr.calling_conventions import SimRegArg
+from angr.code_location import CodeLocation
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 

angr/analyses/decompiler/optimization_passes/ret_addr_save_simplifier.py

@@ -4,7 +4,7 @@ import logging
 
 import ailment
 
-from ....calling_conventions import SimRegArg, default_cc, DEFAULT_CC
+from angr.calling_conventions import SimRegArg, default_cc, DEFAULT_CC
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 _l = logging.getLogger(name=__name__)

angr/analyses/decompiler/optimization_passes/ret_deduplicator.py

@@ -5,9 +5,9 @@ import logging
 from ailment import Block
 from ailment.statement import ConditionalJump, Return
 
-from ..structuring import SAILRStructurer, DreamStructurer
-from ....utils.graph import subgraph_between_nodes
-from ..utils import remove_labels, to_ail_supergraph, update_labels
+from angr.analyses.decompiler.structuring import SAILRStructurer, DreamStructurer
+from angr.utils.graph import subgraph_between_nodes
+from angr.analyses.decompiler.utils import remove_labels, to_ail_supergraph, update_labels
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 

angr/analyses/decompiler/optimization_passes/return_duplicator_base.py

@@ -12,11 +12,11 @@ from ailment.statement import Jump, ConditionalJump, Assignment, Return, Label
 from ailment.expression import Const, Phi, VirtualVariable
 
 from angr.utils.ail import is_phi_assignment
-from ..condition_processor import ConditionProcessor, EmptyBlockNotice
-from ..graph_region import GraphRegion
-from ..utils import remove_labels, to_ail_supergraph, calls_in_graph
-from ..structuring.structurer_nodes import MultiNode, ConditionNode
-from ..region_identifier import RegionIdentifier
+from angr.analyses.decompiler.condition_processor import ConditionProcessor, EmptyBlockNotice
+from angr.analyses.decompiler.graph_region import GraphRegion
+from angr.analyses.decompiler.utils import remove_labels, to_ail_supergraph, calls_in_graph
+from angr.analyses.decompiler.structuring.structurer_nodes import MultiNode, ConditionNode
+from angr.analyses.decompiler.region_identifier import RegionIdentifier
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/optimization_passes/return_duplicator_high.py

@@ -5,7 +5,7 @@ import networkx
 
 from .return_duplicator_base import ReturnDuplicatorBase
 from .optimization_pass import OptimizationPass, OptimizationPassStage
-from ..structuring import SAILRStructurer, DreamStructurer
+from angr.analyses.decompiler.structuring import SAILRStructurer, DreamStructurer
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/peephole_optimizations/__init__.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import List, Type
 
 from .a_div_const_add_a_mul_n_div_const import ADivConstAddAMulNDivConst
 from .a_mul_const_div_shr_const import AMulConstDivShrConst
@@ -49,23 +48,66 @@ from .coalesce_adjacent_shrs import CoalesceAdjacentShiftRights
 
 from .base import PeepholeOptimizationExprBase, PeepholeOptimizationStmtBase, PeepholeOptimizationMultiStmtBase
 
-MULTI_STMT_OPTS: list[type[PeepholeOptimizationMultiStmtBase]] = []
-STMT_OPTS: list[type[PeepholeOptimizationStmtBase]] = []
-EXPR_OPTS: list[type[PeepholeOptimizationExprBase]] = []
+ALL_PEEPHOLE_OPTS: list[type[PeepholeOptimizationExprBase]] = [
+    ADivConstAddAMulNDivConst,
+    AMulConstDivShrConst,
+    AShlConstSubA,
+    ASubADiv,
+    ASubADivConstMulConst,
+    ARMCmpF,
+    Bswap,
+    CoalesceSameCascadingIfs,
+    ConstantDereferences,
+    ConstMullAShift,
+    ExtendedByteAndMask,
+    RemoveEmptyIfBody,
+    RemoveRedundantITEBranches,
+    SingleBitXor,
+    ASubASubN,
+    ConvASub0ShrAnd,
+    EagerEvaluation,
+    OneSubBool,
+    BoolExprXor1,
+    BitwiseOrToLogicalOr,
+    RemoveRedundantBitmasks,
+    RemoveRedundantNots,
+    RemoveRedundantReinterprets,
+    RemoveRedundantShifts,
+    RemoveRedundantShiftsAroundComparators,
+    SimplifyPcRelativeLoads,
+    BasePointerOffsetAddN,
+    BasePointerOffsetAndMask,
+    RemoveRedundantConversions,
+    RemoveCascadingConversions,
+    ConvShlShr,
+    RewriteMipsGpLoads,
+    RemoveNoopConversions,
+    RewriteBitExtractions,
+    RemoveRedundantITEComparisons,
+    SingleBitCondToBoolExpr,
+    SarToSignedDiv,
+    TidyStackAddr,
+    InvertNegatedLogicalConjunctionsAndDisjunctions,
+    RolRorRewriter,
+    InlinedStrcpy,
+    InlinedStrcpyConsolidation,
+    InlinedWstrcpy,
+    CmpORDRewriter,
+    CoalesceAdjacentShiftRights,
+]
 
-_g = globals().copy()
-for v in _g.values():
-    if isinstance(v, type) and issubclass(v, PeepholeOptimizationExprBase) and v is not PeepholeOptimizationExprBase:
-        EXPR_OPTS.append(v)
+MULTI_STMT_OPTS: list[type[PeepholeOptimizationMultiStmtBase]] = [
+    v for v in ALL_PEEPHOLE_OPTS if issubclass(v, PeepholeOptimizationMultiStmtBase)
+]
+STMT_OPTS: list[type[PeepholeOptimizationStmtBase]] = [
+    v for v in ALL_PEEPHOLE_OPTS if issubclass(v, PeepholeOptimizationStmtBase)
+]
+EXPR_OPTS: list[type[PeepholeOptimizationExprBase]] = [
+    v for v in ALL_PEEPHOLE_OPTS if issubclass(v, PeepholeOptimizationExprBase)
+]
 
-    if isinstance(v, type) and issubclass(v, PeepholeOptimizationStmtBase) and v is not PeepholeOptimizationStmtBase:
-        STMT_OPTS.append(v)
-
-    if (
-        isinstance(v, type)
-        and issubclass(v, PeepholeOptimizationMultiStmtBase)
-        and v is not PeepholeOptimizationMultiStmtBase
-    ):
-        MULTI_STMT_OPTS.append(v)
-
-_g = None
+__all__ = (
+    "MULTI_STMT_OPTS",
+    "STMT_OPTS",
+    "EXPR_OPTS",
+)

angr/analyses/decompiler/peephole_optimizations/simplify_pc_relative_loads.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from ailment.expression import BinaryOp, Const, Load
 
-from ....utils.loader import is_pc, is_in_readonly_section, is_in_readonly_segment
+from angr.utils.loader import is_pc, is_in_readonly_section, is_in_readonly_segment
 from .base import PeepholeOptimizationExprBase
 
 

angr/analyses/decompiler/presets/__init__.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from .preset import DecompilationPreset
+from .fast import preset_fast
+from .full import preset_full
+from .basic import preset_basic
+
+
+DECOMPILATION_PRESETS = {
+    "fast": preset_fast,
+    "full": preset_full,
+    "basic": preset_basic,
+    "default": preset_fast,
+}
+
+
+__all__ = (
+    "DecompilationPreset",
+    "DECOMPILATION_PRESETS",
+)

angr/analyses/decompiler/presets/basic.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+from .preset import DecompilationPreset
+from angr.analyses.decompiler.optimization_passes import (
+    RegisterSaveAreaSimplifier,
+    StackCanarySimplifier,
+    WinStackCanarySimplifier,
+    BasePointerSaveSimplifier,
+    ConstantDereferencesSimplifier,
+    RetAddrSaveSimplifier,
+    X86GccGetPcSimplifier,
+    CallStatementRewriter,
+)
+
+
+preset_basic = DecompilationPreset(
+    "basic",
+    [
+        RegisterSaveAreaSimplifier,
+        StackCanarySimplifier,
+        WinStackCanarySimplifier,
+        BasePointerSaveSimplifier,
+        ConstantDereferencesSimplifier,
+        RetAddrSaveSimplifier,
+        X86GccGetPcSimplifier,
+        CallStatementRewriter,
+    ],
+)
+
+
+__all__ = ["preset_basic"]

angr/analyses/decompiler/presets/fast.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+from .preset import DecompilationPreset
+from angr.analyses.decompiler.optimization_passes import (
+    RegisterSaveAreaSimplifier,
+    StackCanarySimplifier,
+    WinStackCanarySimplifier,
+    BasePointerSaveSimplifier,
+    ConstantDereferencesSimplifier,
+    RetAddrSaveSimplifier,
+    X86GccGetPcSimplifier,
+    ITERegionConverter,
+    ITEExprConverter,
+    ExprOpSwapper,
+    ReturnDuplicatorHigh,
+    SwitchDefaultCaseDuplicator,
+    LoweredSwitchSimplifier,
+    ReturnDuplicatorLow,
+    ReturnDeduplicator,
+    FlipBooleanCmp,
+    InlinedStringTransformationSimplifier,
+    CallStatementRewriter,
+    MultiSimplifier,
+    DeadblockRemover,
+)
+
+
+preset_fast = DecompilationPreset(
+    "fast",
+    [
+        RegisterSaveAreaSimplifier,
+        StackCanarySimplifier,
+        WinStackCanarySimplifier,
+        BasePointerSaveSimplifier,
+        MultiSimplifier,  # TODO: MultiSimplifier should be replaced by a peephole optimization
+        ConstantDereferencesSimplifier,
+        RetAddrSaveSimplifier,
+        X86GccGetPcSimplifier,
+        ITERegionConverter,
+        ITEExprConverter,
+        ExprOpSwapper,
+        ReturnDuplicatorHigh,
+        DeadblockRemover,
+        SwitchDefaultCaseDuplicator,
+        LoweredSwitchSimplifier,
+        ReturnDuplicatorLow,
+        ReturnDeduplicator,
+        FlipBooleanCmp,
+        InlinedStringTransformationSimplifier,
+        CallStatementRewriter,
+    ],
+)
+
+
+__all__ = ["preset_fast"]

angr/analyses/decompiler/presets/full.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+from .preset import DecompilationPreset
+from angr.analyses.decompiler.optimization_passes import (
+    RegisterSaveAreaSimplifier,
+    StackCanarySimplifier,
+    WinStackCanarySimplifier,
+    BasePointerSaveSimplifier,
+    DivSimplifier,
+    MultiSimplifier,
+    ModSimplifier,
+    ConstantDereferencesSimplifier,
+    RetAddrSaveSimplifier,
+    X86GccGetPcSimplifier,
+    ITERegionConverter,
+    ITEExprConverter,
+    ExprOpSwapper,
+    ReturnDuplicatorHigh,
+    DeadblockRemover,
+    SwitchDefaultCaseDuplicator,
+    ConstPropOptReverter,
+    DuplicationReverter,
+    LoweredSwitchSimplifier,
+    ReturnDuplicatorLow,
+    ReturnDeduplicator,
+    CrossJumpReverter,
+    FlipBooleanCmp,
+    InlinedStringTransformationSimplifier,
+    CallStatementRewriter,
+)
+
+
+preset_full = DecompilationPreset(
+    "full",
+    [
+        RegisterSaveAreaSimplifier,
+        StackCanarySimplifier,
+        WinStackCanarySimplifier,
+        BasePointerSaveSimplifier,
+        DivSimplifier,
+        MultiSimplifier,
+        ModSimplifier,
+        ConstantDereferencesSimplifier,
+        RetAddrSaveSimplifier,
+        X86GccGetPcSimplifier,
+        ITERegionConverter,
+        ITEExprConverter,
+        ExprOpSwapper,
+        ReturnDuplicatorHigh,
+        DeadblockRemover,
+        SwitchDefaultCaseDuplicator,
+        ConstPropOptReverter,
+        DuplicationReverter,
+        LoweredSwitchSimplifier,
+        ReturnDuplicatorLow,
+        ReturnDeduplicator,
+        CrossJumpReverter,
+        FlipBooleanCmp,
+        InlinedStringTransformationSimplifier,
+        CallStatementRewriter,
+    ],
+)
+
+
+__all__ = ["preset_full"]

angr/analyses/decompiler/presets/preset.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from archinfo import Arch
+
+from angr.analyses.decompiler.optimization_passes.optimization_pass import OptimizationPass
+
+
+class DecompilationPreset:
+    """
+    A DecompilationPreset provides a preconfigured set of optimizations and configurations for the Decompiler analysis.
+    """
+
+    def __init__(self, name: str, opt_passes: list[type[OptimizationPass]]):
+        self.name = name
+        self.opt_passes = opt_passes
+
+    def get_optimization_passes(self, arch: Arch | str, platform: str | None, additional_opts=None, disable_opts=None):
+        if isinstance(arch, Arch):
+            arch = arch.name
+
+        if platform is not None:
+            platform = platform.lower()
+        if platform == "win32":
+            platform = "windows"  # sigh
+
+        passes = []
+        additional_opts = additional_opts or []
+        disable_opts = disable_opts or []
+        for pass_ in self.opt_passes + additional_opts:
+            if pass_ in disable_opts:
+                continue
+            if (pass_.ARCHES is None or arch in pass_.ARCHES) and (
+                pass_.PLATFORMS is None or platform is None or platform in pass_.PLATFORMS
+            ):
+                passes.append(pass_)
+
+        return passes

angr/analyses/decompiler/region_identifier.py

@@ -11,9 +11,9 @@ from ailment.statement import ConditionalJump, Jump
 from ailment.expression import Const
 
 from angr.utils.graph import GraphUtils
-from ...utils.graph import dfs_back_edges, subgraph_between_nodes, dominates, shallow_reverse
-from ...errors import AngrRuntimeError
-from .. import Analysis, register_analysis
+from angr.utils.graph import dfs_back_edges, subgraph_between_nodes, dominates, shallow_reverse
+from angr.errors import AngrRuntimeError
+from angr.analyses import Analysis, register_analysis
 from .structuring.structurer_nodes import MultiNode, ConditionNode, IncompleteSwitchCaseHeadStatement
 from .graph_region import GraphRegion
 from .condition_processor import ConditionProcessor
@@ -42,8 +42,12 @@ class RegionIdentifier(Analysis):
         largest_successor_tree_outside_loop=True,
         force_loop_single_exit=True,
         complete_successors=False,
+        entry_node_addr: tuple[int, int | None] | None = None,
     ):
         self.function = func
+        self.entry_node_addr: tuple[int, int | None] | None = (
+            entry_node_addr if entry_node_addr is not None else (func.addr, None) if func is not None else None
+        )
         self.cond_proc = (
             cond_proc
             if cond_proc is not None
@@ -144,10 +148,20 @@ class RegionIdentifier(Analysis):
         except StopIteration:
             pass
 
-        try:
-            return next(n for n in graph.nodes() if n.addr == self.function.addr)
-        except StopIteration as ex:
-            raise AngrRuntimeError("Cannot find the start node from the graph!") from ex
+        if self.entry_node_addr is not None:
+            try:
+                return next(
+                    n
+                    for n in graph.nodes()
+                    if (
+                        (n.addr, n.idx) == self.entry_node_addr
+                        if isinstance(n, Block)
+                        else n.addr == self.entry_node_addr[0]
+                    )
+                )
+            except StopIteration as ex:
+                raise AngrRuntimeError("Cannot find the start node from the graph!") from ex
+        raise AngrRuntimeError("Cannot find the start node from the graph!")
 
     def _test_reducibility(self):
         # make a copy of the graph

angr/analyses/decompiler/region_simplifiers/__init__.py

@@ -1,2 +1,5 @@
 from __future__ import annotations
+
 from .region_simplifier import RegionSimplifier
+
+__all__ = ("RegionSimplifier",)

angr/analyses/decompiler/region_simplifiers/cascading_cond_transformer.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 import ailment
 import claripy
 
-from ..structuring.structurer_nodes import ConditionNode, CascadingConditionNode
-from ..sequence_walker import SequenceWalker
-from ....errors import AngrRuntimeError
+from angr.analyses.decompiler.structuring.structurer_nodes import ConditionNode, CascadingConditionNode
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.errors import AngrRuntimeError
 
 
 class CascadingConditionTransformer(SequenceWalker):

angr/analyses/decompiler/region_simplifiers/cascading_ifs.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 import ailment
 
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     MultiNode,
@@ -11,7 +11,7 @@ from ..structuring.structurer_nodes import (
     ConditionNode,
     CascadingConditionNode,
 )
-from ..utils import is_empty_node
+from angr.analyses.decompiler.utils import is_empty_node
 
 
 class CascadingIfsRemover(SequenceWalker):

angr/analyses/decompiler/region_simplifiers/expr_folding.py

@@ -10,8 +10,8 @@ from ailment.expression import ITE
 from ailment.statement import Statement, Assignment, Call
 
 from angr.utils.ail import is_phi_assignment
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     ConditionNode,
     ConditionalBreakNode,
     LoopNode,

angr/analyses/decompiler/region_simplifiers/goto.py

@@ -4,8 +4,8 @@ import logging
 
 import ailment
 
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     MultiNode,
@@ -14,7 +14,7 @@ from ..structuring.structurer_nodes import (
     CascadingConditionNode,
 )
 from .node_address_finder import NodeAddressFinder
-from ..goto_manager import Goto
+from angr.analyses.decompiler.goto_manager import Goto
 
 
 l = logging.getLogger(name=__name__)

angr/analyses/decompiler/region_simplifiers/if_.py

@@ -4,8 +4,8 @@ import logging
 
 import ailment
 
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     MultiNode,

angr/analyses/decompiler/region_simplifiers/ifelse.py

@@ -1,8 +1,8 @@
 # pylint:disable=unused-argument,arguments-differ
 from __future__ import annotations
 
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     MultiNode,
@@ -11,8 +11,8 @@ from ..structuring.structurer_nodes import (
     EmptyBlockNotice,
     CascadingConditionNode,
 )
-from ..condition_processor import ConditionProcessor
-from ..utils import insert_node, is_statement_terminating
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.utils import insert_node, is_statement_terminating
 
 
 class IfElseFlattener(SequenceWalker):

angr/analyses/decompiler/region_simplifiers/loop.py

@@ -4,9 +4,9 @@ from collections import defaultdict
 
 import ailment
 
-from ..condition_processor import ConditionProcessor, EmptyBlockNotice
-from ..sequence_walker import SequenceWalker
-from ..structuring.structurer_nodes import (
+from angr.analyses.decompiler.condition_processor import ConditionProcessor, EmptyBlockNotice
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import (
     SequenceNode,
     CodeNode,
     MultiNode,
@@ -15,7 +15,7 @@ from ..structuring.structurer_nodes import (
     ContinueNode,
     CascadingConditionNode,
 )
-from ..utils import is_statement_terminating, has_nonlabel_nonphi_statements
+from angr.analyses.decompiler.utils import is_statement_terminating, has_nonlabel_nonphi_statements
 
 
 class LoopSimplifier(SequenceWalker):

angr/analyses/decompiler/region_simplifiers/node_address_finder.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import ailment
 
-from ..sequence_walker import SequenceWalker
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
 
 
 class NodeAddressFinder(SequenceWalker):