angr 9.2.126__tar.gz → 9.2.127__tar.gz

{angr-9.2.126/angr.egg-info → angr-9.2.127}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.126
+Version: 9.2.127
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -16,13 +16,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.126
-Requires-Dist: archinfo==9.2.126
+Requires-Dist: ailment==9.2.127
+Requires-Dist: archinfo==9.2.127
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.126
-Requires-Dist: cle==9.2.126
+Requires-Dist: claripy==9.2.127
+Requires-Dist: cle==9.2.127
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=5.28.2
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.126
+Requires-Dist: pyvex==9.2.127
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.126 → angr-9.2.127}/angr/__init__.py

@@ -2,7 +2,7 @@
 # pylint: disable=wrong-import-position
 from __future__ import annotations
 
-__version__ = "9.2.126"
+__version__ = "9.2.127"
 
 if bytes is str:
     raise Exception(

{angr-9.2.126 → angr-9.2.127}/angr/analyses/analysis.py

@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, TypeVar, Generic, cast
 from collections.abc import Callable
 from types import NoneType
 from itertools import chain
+from traceback import format_exception
 
 import logging
 import time
@@ -75,6 +76,11 @@ class AnalysisLogEntry:
 
         self.message = message
 
+    def format(self) -> str:
+        if self.exc_traceback is None:
+            return self.message
+        return "\n".join((*format_exception(self.exc_type, self.exc_value, self.exc_traceback), "", self.message))
+
     def __getstate__(self):
         return (
             str(self.__dict__.get("exc_type")),
@@ -281,8 +287,8 @@ class Analysis:
     kb: KnowledgeBase
     _fail_fast: bool
     _name: str
-    errors = []
-    named_errors = defaultdict(list)
+    errors: list[AnalysisLogEntry] = []
+    named_errors: defaultdict[str, list[AnalysisLogEntry]] = defaultdict(list)
     _progress_callback = None
     _show_progressbar = False
     _progressbar = None

{angr-9.2.126 → angr-9.2.127}/angr/analyses/cfg/cfg_fast.py

@@ -3309,7 +3309,18 @@ class CFGFast(ForwardAnalysis[CFGNode, CFGNode, CFGJob, int], CFGBase):  # pylin
                         # this is not a no-op block. Determine where nop instructions terminate.
                         insns = block.capstone.insns
                         if insns:
-                            nop_length = self._get_nop_length(insns)
+                            if (
+                                self.project.simos is not None
+                                and self.project.simos.name == "Win32"
+                                and insns[0].mnemonic == "mov"
+                            ):
+                                op0, op1 = insns[0].operands
+                                if op0.type == 1 and op1.type == 1 and op0.reg == op1.reg:
+                                    # hot-patch points on Windows DLLs
+                                    # https://devblogs.microsoft.com/oldnewthing/20110921-00/?p=9583
+                                    nop_length = None
+                            else:
+                                nop_length = self._get_nop_length(insns)
 
                     if nop_length is None or nop_length <= 0:
                         continue

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/clinic.py

@@ -1043,6 +1043,7 @@ class Clinic(Analysis):
                                 reg_name=self.project.arch.translate_register_name(
                                     ret_reg_offset, size=self.project.arch.bits
                                 ),
+                                **target.tags,
                             )
                             call_stmt = ailment.Stmt.Call(
                                 None,

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/condition_processor.py

@@ -1113,17 +1113,15 @@ class ConditionProcessor:
         r1_with: claripy.ast.Bool,
     ) -> claripy.ast.Bool:
         if ast.op == "And":
-            return ast.make_like(
-                "And", (ConditionProcessor._replace_term_in_ast(arg, r0, r0_with, r1, r1_with) for arg in ast.args)
+            return claripy.And(
+                *(ConditionProcessor._replace_term_in_ast(arg, r0, r0_with, r1, r1_with) for arg in ast.args)
             )
         if ast.op == "Or":
-            return ast.make_like(
-                "Or", (ConditionProcessor._replace_term_in_ast(arg, r0, r0_with, r1, r1_with) for arg in ast.args)
+            return claripy.Or(
+                *(ConditionProcessor._replace_term_in_ast(arg, r0, r0_with, r1, r1_with) for arg in ast.args)
             )
         if ast.op == "Not":
-            return ast.make_like(
-                "Not", (ConditionProcessor._replace_term_in_ast(ast.args[0], r0, r0_with, r1, r1_with),)
-            )
+            return claripy.Not(ConditionProcessor._replace_term_in_ast(ast.args[0], r0, r0_with, r1, r1_with))
         if ast is r0:
             return r0_with
         if ast is r1:

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/decompilation_cache.py

@@ -23,6 +23,7 @@ class DecompilationCache:
         "clinic",
         "ite_exprs",
         "binop_operators",
+        "errors",
     )
 
     def __init__(self, addr):
@@ -35,7 +36,10 @@ class DecompilationCache:
         self.clinic: Clinic | None = None
         self.ite_exprs: set[tuple[int, Any]] | None = None
         self.binop_operators: dict[OpDescriptor, str] | None = None
+        self.errors: list[str] = []
 
     @property
     def local_types(self):
+        if self.clinic is None or self.clinic.variable_kb is None:
+            return None
         return self.clinic.variable_kb.variables[self.addr].types

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/decompiler.py

@@ -139,7 +139,22 @@ class Decompiler(Analysis):
         self.expr_collapse_depth = expr_collapse_depth
 
         if decompile:
-            self._decompile()
+            with self._resilience():
+                self._decompile()
+            if self.errors:
+                if (self.func.addr, self._flavor) not in self.kb.decompilations:
+                    self.kb.decompilations[(self.func.addr, self._flavor)] = DecompilationCache(self.func.addr)
+                for error in self.errors:
+                    self.kb.decompilations[(self.func.addr, self._flavor)].errors.append(error.format())
+                with self._resilience():
+                    l.info("Decompilation failed for %s. Switching to basic preset and trying again.")
+                    if preset != DECOMPILATION_PRESETS["basic"]:
+                        self._optimization_passes = DECOMPILATION_PRESETS["basic"].get_optimization_passes(
+                            self.project.arch, self.project.simos.name
+                        )
+                        self._decompile()
+                        for error in self.errors:
+                            self.kb.decompilations[(self.func.addr, self._flavor)].errors.append(error.format())
 
     def _can_use_decompilation_cache(self, cache: DecompilationCache) -> bool:
         a, b = self._cache_parameters, cache.parameters
@@ -155,7 +170,7 @@ class Decompiler(Analysis):
 
         if self._cache_parameters is not None:
             try:
-                cache = self.kb.decompilations[self.func.addr]
+                cache = self.kb.decompilations[(self.func.addr, self._flavor)]
                 if not self._can_use_decompilation_cache(cache):
                     cache = None
             except KeyError:
@@ -347,7 +362,7 @@ class Decompiler(Analysis):
         self.cache.codegen = codegen
         self.cache.clinic = self.clinic
 
-        self.kb.decompilations[self.func.addr] = self.cache
+        self.kb.decompilations[(self.func.addr, self._flavor)] = self.cache
 
     def _recover_regions(self, graph: networkx.DiGraph, condition_processor, update_graph: bool = True):
         return self.project.analyses[RegionIdentifier].prep(kb=self.kb)(

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/dephication/graph_vvar_mapping.py

@@ -290,8 +290,7 @@ class GraphDephicationVVarMapping(Analysis):  # pylint:disable=abstract-method
         for stmt in dst_block.statements:
             if isinstance(stmt, Label):
                 continue
-            r, _ = is_phi_assignment(stmt)
-            if r:
+            if is_phi_assignment(stmt):
                 for src_, vvar in stmt.src.src_and_vvars:
                     if src_ == src and vvar is not None and vvar.varid == vvar_id:
                         return True

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/ssailification/traversal.py

@@ -32,6 +32,7 @@ class TraversalAnalysis(ForwardAnalysis[None, NodeType, object, object]):
         )
         self._engine_ail = SimEngineSSATraversal(
             self.project.arch,
+            self.project.simos,
             sp_tracker=sp_tracker,
             bp_as_gpr=bp_as_gpr,
             stackvars=self._stackvars,

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/ssailification/traversal_engine.py

@@ -7,6 +7,7 @@ from ailment.expression import Register, BinaryOp, StackBaseOffset, ITE, VEXCCal
 from angr.engines.light import SimEngineLight, SimEngineLightAILMixin
 from angr.utils.ssa import get_reg_offset_base
 from angr.utils.orderedset import OrderedSet
+from angr.calling_conventions import default_cc
 from .traversal_state import TraversalState
 
 
@@ -23,6 +24,7 @@ class SimEngineSSATraversal(
     def __init__(
         self,
         arch,
+        simos,
         sp_tracker=None,
         bp_as_gpr: bool = False,
         def_to_loc=None,
@@ -33,6 +35,7 @@ class SimEngineSSATraversal(
         super().__init__()
 
         self.arch = arch
+        self.simos = simos
         self.sp_tracker = sp_tracker
         self.bp_as_gpr = bp_as_gpr
         self.stackvars = stackvars
@@ -75,6 +78,18 @@ class SimEngineSSATraversal(
             self._expr(stmt.false_target)
 
     def _handle_Call(self, stmt: Call):
+
+        # kill caller-saved registers
+        cc = (
+            default_cc(self.arch.name, platform=self.simos.name if self.simos is not None else None)
+            if stmt.calling_convention is None
+            else stmt.calling_convention
+        )
+        for reg_name in cc.CALLER_SAVED_REGS:
+            reg_offset = self.arch.registers[reg_name][0]
+            base_off = get_reg_offset_base(reg_offset, self.arch)
+            self.state.live_registers.discard(base_off)
+
         if stmt.ret_expr is not None and isinstance(stmt.ret_expr, Register):
             codeloc = self._codeloc()
             self.def_to_loc.append((stmt.ret_expr, codeloc))

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/structured_codegen/c.py

@@ -2511,9 +2511,6 @@ class CStructuredCodeGenerator(BaseStructuredCodeGenerator, Analysis):
 
         self._analyze()
 
-        if flavor is not None:
-            self.kb.structured_code[(func.addr, flavor)] = self
-
     def reapply_options(self, options):
         for option, value in options:
             if option.param == "braces_on_own_lines":

{angr-9.2.126 → angr-9.2.127}/angr/analyses/decompiler/structured_codegen/dwarf_import.py

@@ -5,6 +5,7 @@ import logging
 from sortedcontainers import SortedList
 
 from angr.analyses import Analysis, register_analysis
+from angr.analyses.decompiler.decompilation_cache import DecompilationCache
 from .base import BaseStructuredCodeGenerator, InstructionMapping, PositionMapping
 from angr.knowledge_plugins.functions.function import Function
 
@@ -30,7 +31,9 @@ class ImportSourceCode(BaseStructuredCodeGenerator, Analysis):
         self.regenerate_text()
 
         if flavor is not None and self.text:
-            self.kb.structured_code[(function.addr, flavor)] = self
+            if (function.addr, flavor) not in self.kb.decompilations:
+                self.kb.decompilations[(function.addr, flavor)] = DecompilationCache(function.addr)
+            self.kb.decompilations[(function.addr, flavor)].codegen = self
 
     def regenerate_text(self):
         cache = {}

{angr-9.2.126 → angr-9.2.127}/angr/analyses/reaching_definitions/function_handler_library/string.py

@@ -46,8 +46,8 @@ class LibcStringHandlers(FunctionHandler):
 
     @FunctionCallDataUnwrapped.decorate
     def handle_impl_strncpy(self, state: ReachingDefinitionsState, data: FunctionCallDataUnwrapped):
-        n = state.get_concrete_value(data.args_atoms[1])
-        src_atom = state.deref(data.args_atoms[2], DerefSize.NULL_TERMINATE if n is None else n)
+        n = state.get_concrete_value(data.args_atoms[2])
+        src_atom = state.deref(data.args_atoms[1], DerefSize.NULL_TERMINATE if n is None else n)
         src_str = state.get_values(src_atom)
         if src_str is not None:
             dst_atom = state.deref(data.args_atoms[0], len(src_str) // 8)

{angr-9.2.126 → angr-9.2.127}/angr/analyses/s_liveness.py

@@ -5,7 +5,7 @@ from ailment.expression import VirtualVariable
 from ailment.statement import Assignment
 
 from angr.analyses import Analysis, register_analysis
-from angr.utils.ssa import is_phi_assignment, VVarUsesCollector
+from angr.utils.ssa import VVarUsesCollector, phi_assignment_get_src
 
 
 class SLivenessModel:
@@ -85,8 +85,8 @@ class SLivenessAnalysis(Analysis):
                 if isinstance(stmt, Assignment) and isinstance(stmt.dst, VirtualVariable):
                     live.discard(stmt.dst.varid)
 
-                r, phi_expr = is_phi_assignment(stmt)
-                if r:
+                phi_expr = phi_assignment_get_src(stmt)
+                if phi_expr is not None:
                     for src, vvar in phi_expr.src_and_vvars:
                         if src not in live_in_by_pred:
                             live_in_by_pred[src] = live.copy()

{angr-9.2.126 → angr-9.2.127}/angr/analyses/s_propagator.py

@@ -4,7 +4,7 @@ import contextlib
 from collections import defaultdict
 
 from ailment.block import Block
-from ailment.expression import Const, VirtualVariable, VirtualVariableCategory, StackBaseOffset
+from ailment.expression import Const, VirtualVariable, VirtualVariableCategory, StackBaseOffset, Load, Convert
 from ailment.statement import Assignment, Store, Return, Jump
 
 from angr.knowledge_plugins.functions import Function
@@ -21,6 +21,7 @@ from angr.utils.ssa import (
     is_const_vvar_tmp_assignment,
     get_tmp_uselocs,
     get_tmp_deflocs,
+    phi_assignment_get_src,
 )
 
 
@@ -129,8 +130,8 @@ class SPropagatorAnalysis(Analysis):
                     replacements[useloc][vvar_at_use] = v
                 continue
 
-            r, v = is_phi_assignment(stmt)
-            if r:
+            v = phi_assignment_get_src(stmt)
+            if v is not None:
                 src_varids = {vvar.varid if vvar is not None else None for _, vvar in v.src_and_vvars}
                 if None not in src_varids and all(varid in const_vvars for varid in src_varids):
                     src_values = {
@@ -182,6 +183,31 @@ class SPropagatorAnalysis(Analysis):
                         # this vvar is used once if we exclude its uses at ret sites or jump sites. we can propagate it
                         for vvar_used, vvar_useloc in vvar_uselocs[vvar.varid]:
                             replacements[vvar_useloc][vvar_used] = stmt.src
+                        continue
+
+                # special logic for global variables: if it's used once or multiple times, and the variable is never
+                # updated before it's used, we will propagate the load
+                if isinstance(stmt, Assignment):
+                    stmt_src = stmt.src
+                    # unpack conversions
+                    while isinstance(stmt_src, Convert):
+                        stmt_src = stmt_src.operand
+                    if isinstance(stmt_src, Load) and isinstance(stmt_src.addr, Const):
+                        gv_updated = False
+                        for vvar_used, vvar_useloc in vvar_uselocs[vvar.varid]:
+                            gv_updated |= self.is_global_variable_updated(
+                                self.func_graph,
+                                blocks,
+                                vvar.varid,
+                                stmt_src.addr.value,
+                                stmt_src.size,
+                                defloc,
+                                vvar_useloc,
+                            )
+                        if not gv_updated:
+                            for vvar_used, vvar_useloc in vvar_uselocs[vvar.varid]:
+                                replacements[vvar_useloc][vvar_used] = stmt.src
+                            continue
 
         for vvar_id, uselocs in vvar_uselocs.items():
             vvar = next(iter(uselocs))[0] if vvar_id not in vvarid_to_vvar else vvarid_to_vvar[vvar_id]
@@ -257,5 +283,50 @@ class SPropagatorAnalysis(Analysis):
 
         self.model.replacements = replacements
 
+    @staticmethod
+    def is_global_variable_updated(
+        func_graph, block_dict, varid: int, gv_addr: int, gv_size: int, defloc: CodeLocation, useloc: CodeLocation
+    ) -> bool:
+        defblock = block_dict[(defloc.block_addr, defloc.block_idx)]
+        useblock = block_dict[(useloc.block_addr, useloc.block_idx)]
+
+        # traverse a graph slice from the def block to the use block and check if the global variable is updated
+        seen = {defblock}
+        queue = [defblock]
+        while queue:
+            block = queue.pop(0)
+
+            start_stmt_idx = defloc.stmt_idx if block is defblock else 0  # inclusive
+            end_stmt_idx = useloc.stmt_idx if block is useblock else len(block.statements)  # exclusive
+
+            for idx in range(start_stmt_idx, end_stmt_idx):
+                stmt = block.statements[idx]
+                if isinstance(stmt, Store) and isinstance(stmt.addr, Const):
+                    store_addr = stmt.addr.value
+                    store_size = stmt.size
+                    if gv_addr <= store_addr < gv_addr + gv_size or store_addr <= gv_addr < store_addr + store_size:
+                        return True
+
+            if block is useblock:
+                continue
+
+            for succ in func_graph.successors(block):
+                if succ not in seen:
+                    abort_path = False
+                    for stmt in succ.statements:
+                        if is_phi_assignment(stmt) and any(
+                            vvar.varid == varid for _, vvar in stmt.src.src_and_vvars if vvar is not None
+                        ):
+                            # the virtual variable is no longer live after this point
+                            abort_path = True
+                            break
+                    if abort_path:
+                        continue
+
+                    seen.add(succ)
+                    queue.append(succ)
+
+        return False
+
 
 register_analysis(SPropagatorAnalysis, "SPropagator")

{angr-9.2.126 → angr-9.2.127}/angr/angrdb/models.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from sqlalchemy import Column, Integer, String, Boolean, BLOB, ForeignKey
+from sqlalchemy import Column, Integer, String, Boolean, BLOB, TEXT, ForeignKey
 from sqlalchemy.orm import declarative_base, relationship
 
 Base = declarative_base()
@@ -127,6 +127,7 @@ class DbStructuredCode(Base):
     configuration = Column(BLOB, nullable=True)
     const_formats = Column(BLOB, nullable=True)
     ite_exprs = Column(BLOB, nullable=True)
+    errors = Column(TEXT, nullable=True)
 
 
 class DbXRefs(Base):

{angr-9.2.126 → angr-9.2.127}/angr/angrdb/serializers/kb.py

@@ -16,7 +16,7 @@ class KnowledgeBaseSerializer:
     """
 
     @staticmethod
-    def dump(session, kb):
+    def dump(session, kb: KnowledgeBase):
         """
 
         :param session:             The database session object.
@@ -40,7 +40,7 @@ class KnowledgeBaseSerializer:
         CommentsSerializer.dump(session, db_kb, kb.comments)
         LabelsSerializer.dump(session, db_kb, kb.labels)
         VariableManagerSerializer.dump(session, db_kb, kb.variables)
-        StructuredCodeManagerSerializer.dump(session, db_kb, kb.structured_code)
+        StructuredCodeManagerSerializer.dump(session, db_kb, kb.decompilations)
 
     @staticmethod
     def load(session, project, name):
@@ -89,7 +89,7 @@ class KnowledgeBaseSerializer:
         # Load structured code
         structured_code = StructuredCodeManagerSerializer.load(session, db_kb, kb)
         if structured_code is not None:
-            kb.structured_code = structured_code
+            kb.decompilations = structured_code
 
         if cfg_model is not None:
             # CFG may not exist for all knowledge bases

{angr-9.2.126 → angr-9.2.127}/angr/angrdb/serializers/structured_code.py

@@ -37,15 +37,15 @@ class StructuredCodeManagerSerializer:
             # TODO: Cache types
 
             expr_comments = None
-            if cache.codegen.expr_comments:
+            if cache.codegen is not None and cache.codegen.expr_comments:
                 expr_comments = json.dumps(cache.codegen.expr_comments).encode("utf-8")
 
             stmt_comments = None
-            if cache.codegen.stmt_comments:
+            if cache.codegen is not None and cache.codegen.stmt_comments:
                 stmt_comments = json.dumps(cache.codegen.stmt_comments).encode("utf-8")
 
             const_formats = None
-            if cache.codegen.const_formats:
+            if cache.codegen is not None and cache.codegen.const_formats:
                 const_formats = pickle.dumps(cache.codegen.const_formats)
 
             ite_exprs = None
@@ -60,6 +60,7 @@ class StructuredCodeManagerSerializer:
                 stmt_comments=stmt_comments,
                 const_formats=const_formats,
                 ite_exprs=ite_exprs,
+                errors="\n\n\n".join(cache.errors),
                 # configuration=configuration,
             )
             session.add(db_code)
@@ -118,6 +119,7 @@ class StructuredCodeManagerSerializer:
             cache = DecompilationCache(db_code.func_addr)
             cache.codegen = dummy_codegen
             cache.ite_exprs = ite_exprs
+            cache.errors = db_code.errors.split("\n\n\n")
             manager[(db_code.func_addr, db_code.flavor)] = cache
 
         return manager

{angr-9.2.126 → angr-9.2.127}/angr/calling_conventions.py

@@ -1654,7 +1654,7 @@ class SimCCAMD64WindowsSyscall(SimCCSyscall):
 class SimCCARM(SimCC):
     ARG_REGS = ["r0", "r1", "r2", "r3"]
     FP_ARG_REGS = []  # regular arg regs are used as fp arg regs
-    CALLER_SAVED_REGS = []
+    CALLER_SAVED_REGS = ["r0", "r1", "r2", "r3"]
     RETURN_ADDR = SimRegArg("lr", 4)
     RETURN_VAL = SimRegArg("r0", 4)
     OVERFLOW_RETURN_VAL = SimRegArg("r1", 4)

{angr-9.2.126 → angr-9.2.127}/angr/knowledge_base.py

@@ -35,13 +35,13 @@ class KnowledgeBase:
 
     functions: FunctionManager
     variables: VariableManager
-    structured_code: StructuredCodeManager
     defs: KeyDefinitionManager
     cfgs: CFGManager
     _project: Project
     types: TypesStore
     propagations: PropagationManager
     xrefs: XRefManager
+    decompilations: StructuredCodeManager
 
     def __init__(self, project, obj=None, name=None):
         if obj is not None:

{angr-9.2.126 → angr-9.2.127}/angr/knowledge_plugins/__init__.py

@@ -17,7 +17,6 @@ from .structured_code import StructuredCodeManager
 from .types import TypesStore
 from .callsite_prototypes import CallsitePrototypes
 from .custom_strings import CustomStrings
-from .decompilation import DecompilationManager
 from .obfuscations import Obfuscations
 
 
@@ -40,6 +39,5 @@ __all__ = (
     "TypesStore",
     "CallsitePrototypes",
     "CustomStrings",
-    "DecompilationManager",
     "Obfuscations",
 )

{angr-9.2.126 → angr-9.2.127}/angr/knowledge_plugins/structured_code.py

@@ -60,4 +60,4 @@ class StructuredCodeManager(KnowledgeBasePlugin):
         raise NotImplementedError
 
 
-KnowledgeBasePlugin.register_default("structured_code", StructuredCodeManager)
+KnowledgeBasePlugin.register_default("decompilations", StructuredCodeManager)

{angr-9.2.126 → angr-9.2.127}/angr/utils/ssa/__init__.py

@@ -178,10 +178,14 @@ def is_const_vvar_load_dirty_assignment(stmt: Statement) -> bool:
     return False
 
 
-def is_phi_assignment(stmt: Statement) -> tuple[bool, Phi | None]:
+def is_phi_assignment(stmt: Statement) -> bool:
+    return isinstance(stmt, Assignment) and isinstance(stmt.src, Phi)
+
+
+def phi_assignment_get_src(stmt: Statement) -> Phi | None:
     if isinstance(stmt, Assignment) and isinstance(stmt.src, Phi):
-        return True, stmt.src
-    return False, None
+        return stmt.src
+    return None
 
 
 __all__ = (
@@ -190,6 +194,7 @@ __all__ = (
     "get_vvar_uselocs",
     "is_const_assignment",
     "is_phi_assignment",
+    "phi_assignment_get_src",
     "is_const_and_vvar_assignment",
     "is_const_vvar_load_assignment",
     "is_const_vvar_load_dirty_assignment",

{angr-9.2.126 → angr-9.2.127/angr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: angr
-Version: 9.2.126
+Version: 9.2.127
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 Home-page: https://github.com/angr/angr
 License: BSD-2-Clause
@@ -16,13 +16,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: CppHeaderParser
 Requires-Dist: GitPython
-Requires-Dist: ailment==9.2.126
-Requires-Dist: archinfo==9.2.126
+Requires-Dist: ailment==9.2.127
+Requires-Dist: archinfo==9.2.127
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.126
-Requires-Dist: cle==9.2.126
+Requires-Dist: claripy==9.2.127
+Requires-Dist: cle==9.2.127
 Requires-Dist: itanium-demangler
 Requires-Dist: mulpyplexer
 Requires-Dist: nampa
@@ -31,7 +31,7 @@ Requires-Dist: protobuf>=5.28.2
 Requires-Dist: psutil
 Requires-Dist: pycparser>=2.18
 Requires-Dist: pyformlang
-Requires-Dist: pyvex==9.2.126
+Requires-Dist: pyvex==9.2.127
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.126 → angr-9.2.127}/angr.egg-info/SOURCES.txt

@@ -512,7 +512,6 @@ angr/knowledge_plugins/comments.py
 angr/knowledge_plugins/custom_strings.py
 angr/knowledge_plugins/data.py
 angr/knowledge_plugins/debug_variables.py
-angr/knowledge_plugins/decompilation.py
 angr/knowledge_plugins/indirect_jumps.py
 angr/knowledge_plugins/labels.py
 angr/knowledge_plugins/obfuscations.py

{angr-9.2.126 → angr-9.2.127}/angr.egg-info/requires.txt

@@ -1,12 +1,12 @@
 CppHeaderParser
 GitPython
-ailment==9.2.126
-archinfo==9.2.126
+ailment==9.2.127
+archinfo==9.2.127
 cachetools
 capstone==5.0.3
 cffi>=1.14.0
-claripy==9.2.126
-cle==9.2.126
+claripy==9.2.127
+cle==9.2.127
 itanium-demangler
 mulpyplexer
 nampa
@@ -15,7 +15,7 @@ protobuf>=5.28.2
 psutil
 pycparser>=2.18
 pyformlang
-pyvex==9.2.126
+pyvex==9.2.127
 rich>=13.1.0
 sortedcontainers
 sympy

{angr-9.2.126 → angr-9.2.127}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=59", "wheel", "pyvex==9.2.126", "unicorn==2.0.1.post1"]
+requires = ["setuptools>=59", "wheel", "pyvex==9.2.127", "unicorn==2.0.1.post1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]