angr 9.2.119__py3-none-macosx_11_0_arm64.whl → 9.2.120__py3-none-macosx_11_0_arm64.whl

angr/analyses/decompiler/counters/__init__.py

@@ -1,5 +1,16 @@
 from __future__ import annotations
+
 from .boolean_counter import BooleanCounter
 from .call_counter import AILBlockCallCounter
 from .seq_cf_structure_counter import ControlFlowStructureCounter
 from .expression_counters import SingleExpressionCounter, RegisterExpressionCounter, OperatorCounter
+
+
+__all__ = (
+    "BooleanCounter",
+    "AILBlockCallCounter",
+    "ControlFlowStructureCounter",
+    "SingleExpressionCounter",
+    "RegisterExpressionCounter",
+    "OperatorCounter",
+)

angr/analyses/decompiler/decompiler.py

@@ -10,15 +10,14 @@ from cle import SymbolType
 import ailment
 
 from angr.analyses.cfg import CFGFast
-from ...knowledge_plugins.functions.function import Function
-from ...knowledge_base import KnowledgeBase
-from ...sim_variable import SimMemoryVariable, SimRegisterVariable, SimStackVariable
-from ...utils import timethis
-from .. import Analysis, AnalysesHub
+from angr.knowledge_plugins.functions.function import Function
+from angr.knowledge_base import KnowledgeBase
+from angr.sim_variable import SimMemoryVariable, SimRegisterVariable, SimStackVariable
+from angr.utils import timethis
+from angr.analyses import Analysis, AnalysesHub
 from .structuring import RecursiveStructurer, PhoenixStructurer, DEFAULT_STRUCTURER
 from .region_identifier import RegionIdentifier
 from .optimization_passes.optimization_pass import OptimizationPassStage
-from .optimization_passes import get_default_optimization_passes
 from .ailgraph_walker import AILGraphWalker
 from .condition_processor import ConditionProcessor
 from .decompilation_options import DecompilationOption
@@ -26,6 +25,7 @@ from .decompilation_cache import DecompilationCache
 from .utils import remove_labels
 from .sequence_walker import SequenceWalker
 from .structuring.structurer_nodes import SequenceNode
+from .presets import DECOMPILATION_PRESETS, DecompilationPreset
 
 if TYPE_CHECKING:
     from angr.knowledge_plugins.cfg.cfg_model import CFGModel
@@ -52,6 +52,7 @@ class Decompiler(Analysis):
         func: Function | str | int,
         cfg: CFGFast | CFGModel | None = None,
         options=None,
+        preset: str | DecompilationPreset | None = None,
         optimization_passes=None,
         sp_tracker_track_memory=True,
         variable_kb=None,
@@ -73,11 +74,21 @@ class Decompiler(Analysis):
         self.func: Function = func
         self._cfg = cfg.model if isinstance(cfg, CFGFast) else cfg
         self._options = options
-        if optimization_passes is None:
-            self._optimization_passes = get_default_optimization_passes(self.project.arch, self.project.simos.name)
-            l.debug("Get %d optimization passes for the current binary.", len(self._optimization_passes))
-        else:
+
+        if preset is None and optimization_passes:
             self._optimization_passes = optimization_passes
+        else:
+            # we use the preset
+            if isinstance(preset, str):
+                if preset not in DECOMPILATION_PRESETS:
+                    raise KeyError(f"Decompilation preset {preset} is not found")
+                preset = DECOMPILATION_PRESETS[preset]
+            elif preset is None:
+                preset = DECOMPILATION_PRESETS["default"]
+            if not isinstance(preset, DecompilationPreset):
+                raise TypeError('"preset" must be a DecompilationPreset instance')
+            self._optimization_passes = preset.get_optimization_passes(self.project.arch, self.project.simos.name)
+        l.debug("Get %d optimization passes for the current binary.", len(self._optimization_passes))
         self._sp_tracker_track_memory = sp_tracker_track_memory
         self._peephole_optimizations = peephole_optimizations
         self._vars_must_struct = vars_must_struct
@@ -299,6 +310,7 @@ class Decompiler(Analysis):
             update_graph=update_graph,
             force_loop_single_exit=self._force_loop_single_exit,
             complete_successors=self._complete_successors,
+            entry_node_addr=self.clinic.entry_node_addr,
             **self.options_to_params(self.options_by_class["region_identifier"]),
         )
 
@@ -342,6 +354,7 @@ class Decompiler(Analysis):
                 graph=ail_graph,
                 variable_kb=self._variable_kb,
                 reaching_definitions=reaching_definitions,
+                entry_node_addr=self.clinic.entry_node_addr,
                 **kwargs,
             )
 
@@ -400,6 +413,7 @@ class Decompiler(Analysis):
                 region_identifier=ri,
                 reaching_definitions=reaching_definitions,
                 vvar_id_start=self.vvar_id_start,
+                entry_node_addr=self.clinic.entry_node_addr,
                 **kwargs,
             )
 

angr/analyses/decompiler/dephication/seqnode_dephication.py

@@ -10,7 +10,7 @@ from ailment.expression import VirtualVariable, Phi
 from angr.utils.ail import is_phi_assignment
 from angr.knowledge_plugins.functions import Function
 from angr.analyses import register_analysis
-from angr.analyses.decompiler.structuring.structurer_nodes import SequenceNode
+from angr.analyses.decompiler.structuring.structurer_nodes import SequenceNode, LoopNode
 from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from .dephication_base import DephicationBase
 from .rewriting_engine import SimEngineDephiRewriting
@@ -57,6 +57,8 @@ class SeqNodeRewriter(SequenceWalker):
         super().__init__(
             handlers={
                 Block: self._handle_Block,
+                # statement handlers
+                Assignment: self._handle_Assignment,
             }
         )
 
@@ -68,6 +70,9 @@ class SeqNodeRewriter(SequenceWalker):
             # nothing is changed during rewriting
             self.output = seq_node
 
+    def _handle_Assignment(self, stmt: Assignment, **kwargs) -> Assignment:  # pylint:disable=unused-argument
+        return self.engine._handle_Assignment(stmt)
+
     def _handle_Block(self, block: Block, **kwargs) -> Block | None:  # pylint:disable=unused-argument
         self.engine.out_block = None
         self.engine.process(None, block=block)
@@ -78,6 +83,19 @@ class SeqNodeRewriter(SequenceWalker):
             return out
         return None
 
+    def _handle_Loop(self, node: LoopNode, **kwargs):
+        new_loop = super()._handle_Loop(node, **kwargs)
+        changed = False
+        if new_loop is None:
+            new_loop = node
+        else:
+            changed = True
+
+        if is_phi_assignment(new_loop.initializer):
+            changed = True
+            new_loop.initializer = None
+        return new_loop if changed else None
+
 
 class SeqNodeDephication(DephicationBase):
     """

angr/analyses/decompiler/optimization_passes/__init__.py

@@ -1,6 +1,5 @@
 # pylint:disable=import-outside-toplevel
 from __future__ import annotations
-from typing import Optional, Union
 
 from archinfo import Arch
 
@@ -33,33 +32,33 @@ from .call_stmt_rewriter import CallStatementRewriter
 from .duplication_reverter import DuplicationReverter
 
 # order matters!
-_all_optimization_passes = [
-    (RegisterSaveAreaSimplifier, True),
-    (StackCanarySimplifier, True),
-    (WinStackCanarySimplifier, True),
-    (BasePointerSaveSimplifier, True),
-    (DivSimplifier, True),
-    (MultiSimplifier, True),
-    (ModSimplifier, True),
-    (ConstantDereferencesSimplifier, True),
-    (RetAddrSaveSimplifier, True),
-    (X86GccGetPcSimplifier, True),
-    (ITERegionConverter, True),
-    (ITEExprConverter, True),
-    (ExprOpSwapper, True),
-    (ReturnDuplicatorHigh, True),
-    (DeadblockRemover, True),
-    (SwitchDefaultCaseDuplicator, True),
-    (ConstPropOptReverter, True),
-    (DuplicationReverter, True),
-    (LoweredSwitchSimplifier, True),
-    (ReturnDuplicatorLow, True),
-    (ReturnDeduplicator, True),
-    (CodeMotionOptimization, False),
-    (CrossJumpReverter, True),
-    (FlipBooleanCmp, True),
-    (InlinedStringTransformationSimplifier, True),
-    (CallStatementRewriter, True),
+ALL_OPTIMIZATION_PASSES = [
+    RegisterSaveAreaSimplifier,
+    StackCanarySimplifier,
+    WinStackCanarySimplifier,
+    BasePointerSaveSimplifier,
+    DivSimplifier,
+    MultiSimplifier,
+    ModSimplifier,
+    ConstantDereferencesSimplifier,
+    RetAddrSaveSimplifier,
+    X86GccGetPcSimplifier,
+    ITERegionConverter,
+    ITEExprConverter,
+    ExprOpSwapper,
+    ReturnDuplicatorHigh,
+    DeadblockRemover,
+    SwitchDefaultCaseDuplicator,
+    ConstPropOptReverter,
+    DuplicationReverter,
+    LoweredSwitchSimplifier,
+    ReturnDuplicatorLow,
+    ReturnDeduplicator,
+    CodeMotionOptimization,
+    CrossJumpReverter,
+    FlipBooleanCmp,
+    InlinedStringTransformationSimplifier,
+    CallStatementRewriter,
 ]
 
 # these passes may duplicate code to remove gotos or improve the structure of the graph
@@ -78,7 +77,7 @@ def get_optimization_passes(arch, platform):
         platform = "windows"  # sigh
 
     passes = []
-    for pass_, _ in _all_optimization_passes:
+    for pass_ in ALL_OPTIMIZATION_PASSES:
         if (pass_.ARCHES is None or arch in pass_.ARCHES) and (
             pass_.PLATFORMS is None or platform is None or platform in pass_.PLATFORMS
         ):
@@ -87,28 +86,41 @@ def get_optimization_passes(arch, platform):
     return passes
 
 
-def get_default_optimization_passes(arch: Arch | str, platform: str | None, enable_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 = []
-    enable_opts = enable_opts or []
-    disable_opts = disable_opts or []
-    for pass_, default in _all_optimization_passes:
-        if (not default and pass_ not in enable_opts) or 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
-
-
-def register_optimization_pass(opt_pass, enable_by_default: bool):
-    _all_optimization_passes.append((opt_pass, enable_by_default))
+def register_optimization_pass(opt_pass):
+    ALL_OPTIMIZATION_PASSES.append(opt_pass)
+
+
+__all__ = (
+    "OptimizationPassStage",
+    "StackCanarySimplifier",
+    "BasePointerSaveSimplifier",
+    "ExprOpSwapper",
+    "ITERegionConverter",
+    "ITEExprConverter",
+    "LoweredSwitchSimplifier",
+    "MultiSimplifier",
+    "DivSimplifier",
+    "ModSimplifier",
+    "ReturnDuplicatorLow",
+    "ReturnDuplicatorHigh",
+    "ConstantDereferencesSimplifier",
+    "RegisterSaveAreaSimplifier",
+    "RetAddrSaveSimplifier",
+    "X86GccGetPcSimplifier",
+    "FlipBooleanCmp",
+    "ReturnDeduplicator",
+    "WinStackCanarySimplifier",
+    "CrossJumpReverter",
+    "CodeMotionOptimization",
+    "SwitchDefaultCaseDuplicator",
+    "DeadblockRemover",
+    "InlinedStringTransformationSimplifier",
+    "ConstPropOptReverter",
+    "CallStatementRewriter",
+    "DuplicationReverter",
+    "ALL_OPTIMIZATION_PASSES",
+    "DUPLICATING_OPTS",
+    "CONDENSING_OPTS",
+    "get_optimization_passes",
+    "register_optimization_pass",
+)

angr/analyses/decompiler/optimization_passes/const_derefs.py

@@ -7,7 +7,7 @@ from ailment import Block, AILBlockWalker
 from ailment.expression import Load, Const, BinaryOp, UnaryOp
 from ailment.statement import Statement, Assignment, Call, ConditionalJump
 
-from ..ailgraph_walker import AILGraphWalker
+from angr.analyses.decompiler.ailgraph_walker import AILGraphWalker
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 if TYPE_CHECKING:

angr/analyses/decompiler/optimization_passes/const_prop_reverter.py

@@ -11,9 +11,9 @@ from ailment.statement import Call, Statement, ConditionalJump, Assignment, Stor
 from ailment.expression import Convert, Register, Expression
 
 from .optimization_pass import OptimizationPass, OptimizationPassStage
-from ..structuring import SAILRStructurer, DreamStructurer
-from ....knowledge_plugins.key_definitions.atoms import MemoryLocation
-from ....knowledge_plugins.key_definitions.constants import OP_BEFORE
+from angr.analyses.decompiler.structuring import SAILRStructurer, DreamStructurer
+from angr.knowledge_plugins.key_definitions.atoms import MemoryLocation
+from angr.knowledge_plugins.key_definitions.constants import OP_BEFORE
 
 
 _l = logging.getLogger(__name__)

angr/analyses/decompiler/optimization_passes/cross_jump_reverter.py

@@ -6,7 +6,7 @@ import logging
 import inspect
 
 from .optimization_pass import OptimizationPassStage, StructuringOptimizationPass
-from ..counters import AILBlockCallCounter
+from angr.analyses.decompiler.counters import AILBlockCallCounter
 
 l = logging.getLogger(__name__)
 

angr/analyses/decompiler/optimization_passes/duplication_reverter/__init__.py

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

angr/analyses/decompiler/optimization_passes/duplication_reverter/duplication_reverter.py

@@ -22,13 +22,13 @@ from .utils import (
     correct_jump_targets,
     deepcopy_ail_anyjump,
 )
-from ..optimization_pass import StructuringOptimizationPass
-from ...block_io_finder import BlockIOFinder
-from ...block_similarity import is_similar, index_of_similar_stmts, longest_ail_subseq
-from ...utils import to_ail_supergraph, remove_labels
-from ...counters.boolean_counter import BooleanCounter
-from .....knowledge_plugins.key_definitions.atoms import MemoryLocation
-from .....utils.graph import dominates
+from angr.analyses.decompiler.optimization_passes.optimization_pass import StructuringOptimizationPass
+from angr.analyses.decompiler.block_io_finder import BlockIOFinder
+from angr.analyses.decompiler.block_similarity import is_similar, index_of_similar_stmts, longest_ail_subseq
+from angr.analyses.decompiler.utils import to_ail_supergraph, remove_labels
+from angr.analyses.decompiler.counters.boolean_counter import BooleanCounter
+from angr.knowledge_plugins.key_definitions.atoms import MemoryLocation
+from angr.utils.graph import dominates
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/optimization_passes/duplication_reverter/similarity.py

@@ -7,7 +7,7 @@ import networkx as nx
 from ailment.block import Block
 
 from .utils import bfs_list_blocks
-from ...block_similarity import longest_ail_subseq, is_similar
+from angr.analyses.decompiler.block_similarity import longest_ail_subseq, is_similar
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/optimization_passes/duplication_reverter/utils.py

@@ -9,7 +9,7 @@ from ailment.block import Block
 from ailment.statement import Statement, ConditionalJump, Jump
 
 from .errors import UnsupportedAILNodeError
-from ...structuring.structurer_nodes import IncompleteSwitchCaseHeadStatement
+from angr.analyses.decompiler.structuring.structurer_nodes import IncompleteSwitchCaseHeadStatement
 
 
 _l = logging.getLogger(name=__name__)

angr/analyses/decompiler/optimization_passes/engine_base.py

@@ -4,8 +4,8 @@ import logging
 
 from ailment import Expr, Stmt
 
-from ....engines.light import SimEngineLightAILMixin
-from ....engines.light import SimEngineLight
+from angr.engines.light import SimEngineLightAILMixin
+from angr.engines.light import SimEngineLight
 
 _l = logging.getLogger(name=__name__)
 

angr/analyses/decompiler/optimization_passes/expr_op_swapper.py

@@ -7,8 +7,8 @@ from ailment.block import Block as AILBlock
 from ailment.statement import Statement
 from ailment.expression import Expression, BinaryOp
 
-from ..sequence_walker import SequenceWalker
-from ..ail_simplifier import AILBlockWalker
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.ail_simplifier import AILBlockWalker
 from .optimization_pass import SequenceOptimizationPass, OptimizationPassStage
 
 if TYPE_CHECKING:

angr/analyses/decompiler/optimization_passes/flip_boolean_cmp.py

@@ -5,9 +5,9 @@ from typing import Any
 import ailment
 from ailment.expression import Op
 
-from ..structuring.structurer_nodes import ConditionNode
-from ..utils import structured_node_is_simple_return, sequence_to_statements
-from ..sequence_walker import SequenceWalker
+from angr.analyses.decompiler.structuring.structurer_nodes import ConditionNode
+from angr.analyses.decompiler.utils import structured_node_is_simple_return, sequence_to_statements
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
 from .optimization_pass import SequenceOptimizationPass, OptimizationPassStage
 
 
@@ -79,7 +79,7 @@ class FlipBooleanCmp(SequenceOptimizationPass):
 
     def __init__(self, func, flip_size=10, **kwargs):
         super().__init__(func, **kwargs)
-        self._graph = kwargs.get("graph", None)
+        self._graph = kwargs.get("graph")
         self._flip_size = flip_size
         self.analyze()
 

angr/analyses/decompiler/optimization_passes/ite_expr_converter.py

@@ -6,12 +6,12 @@ from typing import Any, TYPE_CHECKING
 from ailment.statement import ConditionalJump, Assignment, Statement
 from ailment.expression import Const, ITE, Expression
 
-from ....analyses import ReachingDefinitionsAnalysis
-from ....code_location import CodeLocation
-from ..region_walker import RegionWalker
-from ..ail_simplifier import AILBlockWalker
-from ..condition_processor import ConditionProcessor
-from ..structuring.structurer_nodes import EmptyBlockNotice
+from angr.analyses import ReachingDefinitionsAnalysis
+from angr.code_location import CodeLocation
+from angr.analyses.decompiler.region_walker import RegionWalker
+from angr.analyses.decompiler.ail_simplifier import AILBlockWalker
+from angr.analyses.decompiler.condition_processor import ConditionProcessor
+from angr.analyses.decompiler.structuring.structurer_nodes import EmptyBlockNotice
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 if TYPE_CHECKING:

angr/analyses/decompiler/optimization_passes/ite_region_converter.py

@@ -7,8 +7,8 @@ from ailment.statement import Statement, Call, ConditionalJump, Assignment, Jump
 from ailment.expression import ITE, Const, VirtualVariable, Phi
 
 from angr.utils.ail import is_phi_assignment
-from ....utils.graph import subgraph_between_nodes
-from ..utils import remove_labels, to_ail_supergraph
+from angr.utils.graph import subgraph_between_nodes
+from angr.analyses.decompiler.utils import remove_labels, to_ail_supergraph
 from .optimization_pass import OptimizationPass, OptimizationPassStage
 
 

angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py

@@ -10,10 +10,14 @@ from ailment.statement import ConditionalJump, Label, Assignment, Jump
 from ailment.expression import Expression, BinaryOp, Const, Load
 
 from angr.utils.graph import GraphUtils
-from ..utils import first_nonlabel_nonphi_statement, remove_last_statement
-from ..structuring.structurer_nodes import IncompleteSwitchCaseHeadStatement, SequenceNode, MultiNode
+from angr.analyses.decompiler.utils import first_nonlabel_nonphi_statement, remove_last_statement
+from angr.analyses.decompiler.structuring.structurer_nodes import (
+    IncompleteSwitchCaseHeadStatement,
+    SequenceNode,
+    MultiNode,
+)
 from .optimization_pass import MultipleBlocksException, StructuringOptimizationPass
-from ..region_simplifiers.switch_cluster_simplifier import SwitchClusterFinder
+from angr.analyses.decompiler.region_simplifiers.switch_cluster_simplifier import SwitchClusterFinder
 
 if TYPE_CHECKING:
     from ailment.expression import UnaryOp, Convert

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__)