angr 9.2.171__cp310-abi3-macosx_10_12_x86_64.whl → 9.2.172__cp310-abi3-macosx_10_12_x86_64.whl

angr/__init__.py

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

angr/analyses/decompiler/decompiler.py

@@ -562,7 +562,13 @@ class Decompiler(Analysis):
                 continue
 
             pass_ = timethis(pass_)
-            a = pass_(self.func, seq=seq_node, scratch=self._optimization_scratch, **kwargs)
+            a = pass_(
+                self.func,
+                seq=seq_node,
+                scratch=self._optimization_scratch,
+                peephole_optimizations=self._peephole_optimizations,
+                **kwargs,
+            )
             if a.out_seq:
                 seq_node = a.out_seq
 

angr/analyses/decompiler/optimization_passes/__init__.py

@@ -35,6 +35,7 @@ from .switch_reused_entry_rewriter import SwitchReusedEntryRewriter
 from .condition_constprop import ConditionConstantPropagation
 from .determine_load_sizes import DetermineLoadSizes
 from .eager_std_string_concatenation import EagerStdStringConcatenationPass
+from .peephole_simplifier import PostStructuringPeepholeOptimizationPass
 
 if TYPE_CHECKING:
     from angr.analyses.decompiler.presets import DecompilationPreset
@@ -72,6 +73,7 @@ ALL_OPTIMIZATION_PASSES = [
     ConditionConstantPropagation,
     DetermineLoadSizes,
     EagerStdStringConcatenationPass,
+    PostStructuringPeepholeOptimizationPass,
 ]
 
 # these passes may duplicate code to remove gotos or improve the structure of the graph

angr/analyses/decompiler/optimization_passes/peephole_simplifier.py

@@ -0,0 +1,75 @@
+from __future__ import annotations
+
+from angr import ailment
+from angr.analyses.decompiler.utils import (
+    peephole_optimize_expr,
+)
+from angr.analyses.decompiler.sequence_walker import SequenceWalker
+from angr.analyses.decompiler.peephole_optimizations import (
+    PeepholeOptimizationExprBase,
+    EXPR_OPTS,
+)
+from .optimization_pass import OptimizationPassStage, SequenceOptimizationPass
+
+
+class ExpressionSequenceWalker(SequenceWalker):
+    """
+    Walks sequences with generic expression handling.
+    """
+
+    def _handle(self, node, **kwargs):
+        if isinstance(node, ailment.Expr.Expression):
+            handler = self._handlers.get(ailment.Expr.Expression, None)
+            if handler:
+                return handler(node, **kwargs)
+        return super()._handle(node, **kwargs)
+
+
+class PostStructuringPeepholeOptimizationPass(SequenceOptimizationPass):
+    """
+    Perform a post-structuring peephole optimization pass to simplify node statements and expressions.
+    """
+
+    ARCHES = None
+    PLATFORMS = None
+    STAGE = OptimizationPassStage.AFTER_STRUCTURING
+    NAME = "Post-Structuring Peephole Optimization"
+    DESCRIPTION = (__doc__ or "").strip()
+
+    def __init__(self, func, peephole_optimizations=None, **kwargs):
+        super().__init__(func, **kwargs)
+        self._peephole_optimizations = peephole_optimizations
+        self._expr_peephole_opts = [
+            cls(self.project, self.kb, self._func.addr)
+            for cls in (self._peephole_optimizations or EXPR_OPTS)
+            if issubclass(cls, PeepholeOptimizationExprBase)
+        ]
+        self.analyze()
+
+    def _check(self):
+        return True, None
+
+    def _analyze(self, cache=None):
+        walker = ExpressionSequenceWalker(
+            handlers={ailment.Expr.Expression: self._optimize_expr, ailment.Block: self._optimize_block}
+        )
+        walker.walk(self.seq)
+        self.out_seq = self.seq
+
+    def _optimize_expr(self, expr, **_):
+        new_expr = peephole_optimize_expr(expr, self._expr_peephole_opts)
+        return new_expr if expr != new_expr else None
+
+    def _optimize_block(self, block, **_):
+        old_block, new_block = None, block
+        while old_block != new_block:
+            old_block = new_block
+            # Note: AILBlockSimplifier updates expressions in place
+            simp = self.project.analyses.AILBlockSimplifier(
+                new_block,
+                func_addr=self._func.addr,
+                peephole_optimizations=self._peephole_optimizations,
+            )
+            assert simp.result_block is not None
+            new_block = simp.result_block
+        return new_block if block != new_block else None

angr/analyses/decompiler/presets/basic.py

@@ -10,6 +10,7 @@ from angr.analyses.decompiler.optimization_passes import (
     X86GccGetPcSimplifier,
     CallStatementRewriter,
     SwitchReusedEntryRewriter,
+    PostStructuringPeepholeOptimizationPass,
 )
 
 
@@ -25,6 +26,7 @@ preset_basic = DecompilationPreset(
         X86GccGetPcSimplifier,
         CallStatementRewriter,
         SwitchReusedEntryRewriter,
+        PostStructuringPeepholeOptimizationPass,
     ],
 )
 

angr/analyses/decompiler/presets/fast.py

@@ -23,6 +23,7 @@ from angr.analyses.decompiler.optimization_passes import (
     SwitchReusedEntryRewriter,
     ConditionConstantPropagation,
     DetermineLoadSizes,
+    PostStructuringPeepholeOptimizationPass,
 )
 
 
@@ -51,6 +52,7 @@ preset_fast = DecompilationPreset(
         CallStatementRewriter,
         ConditionConstantPropagation,
         DetermineLoadSizes,
+        PostStructuringPeepholeOptimizationPass,
     ],
 )
 

angr/analyses/decompiler/presets/full.py

@@ -28,6 +28,7 @@ from angr.analyses.decompiler.optimization_passes import (
     SwitchReusedEntryRewriter,
     ConditionConstantPropagation,
     DetermineLoadSizes,
+    PostStructuringPeepholeOptimizationPass,
 )
 
 
@@ -61,6 +62,7 @@ preset_full = DecompilationPreset(
         SwitchReusedEntryRewriter,
         ConditionConstantPropagation,
         DetermineLoadSizes,
+        PostStructuringPeepholeOptimizationPass,
     ],
 )
 

angr/analyses/decompiler/presets/preset.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from archinfo import Arch
 
-from angr.analyses.decompiler.optimization_passes.optimization_pass import OptimizationPass
+from angr.analyses.decompiler.optimization_passes.optimization_pass import BaseOptimizationPass
 
 
 class DecompilationPreset:
@@ -10,7 +10,7 @@ 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]]):
+    def __init__(self, name: str, opt_passes: list[type[BaseOptimizationPass]]):
         self.name = name
         self.opt_passes = opt_passes
 

{angr-9.2.171.dist-info → angr-9.2.172.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.171
+Version: 9.2.172
 Summary: A multi-architecture binary analysis toolkit, with the ability to perform dynamic symbolic execution and various static analyses on binaries
 License: BSD-2-Clause
 Project-URL: Homepage, https://angr.io/
@@ -16,12 +16,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cxxheaderparser
 Requires-Dist: GitPython
-Requires-Dist: archinfo==9.2.171
+Requires-Dist: archinfo==9.2.172
 Requires-Dist: cachetools
 Requires-Dist: capstone==5.0.3
 Requires-Dist: cffi>=1.14.0
-Requires-Dist: claripy==9.2.171
-Requires-Dist: cle==9.2.171
+Requires-Dist: claripy==9.2.172
+Requires-Dist: cle==9.2.172
 Requires-Dist: mulpyplexer
 Requires-Dist: networkx!=2.8.1,>=2.0
 Requires-Dist: protobuf>=5.28.2
@@ -30,7 +30,7 @@ Requires-Dist: pycparser>=2.18
 Requires-Dist: pydemumble
 Requires-Dist: pyformlang
 Requires-Dist: pypcode<4.0,>=3.2.1
-Requires-Dist: pyvex==9.2.171
+Requires-Dist: pyvex==9.2.172
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

{angr-9.2.171.dist-info → angr-9.2.172.dist-info}/RECORD

@@ -1,23 +1,23 @@
-angr-9.2.171.dist-info/RECORD,,
-angr-9.2.171.dist-info/WHEEL,sha256=wTy_3c4XcOAcqIE15cpeRqeJHiJiSBH-pmU5VVW1EO8,137
-angr-9.2.171.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.171.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.171.dist-info/METADATA,sha256=GS64c1YeNbuFYLq1cSi8UTdj9wkmozjiUWSRIbZl_gg,4343
-angr-9.2.171.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
+angr-9.2.172.dist-info/RECORD,,
+angr-9.2.172.dist-info/WHEEL,sha256=wTy_3c4XcOAcqIE15cpeRqeJHiJiSBH-pmU5VVW1EO8,137
+angr-9.2.172.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
+angr-9.2.172.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
+angr-9.2.172.dist-info/METADATA,sha256=55ffKaXpTmUAExTjDVpK_UPO5MKEwSHXIQcMUDrnARY,4343
+angr-9.2.172.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
 angr/vaults.py,sha256=D_gkDegCyPlZMKGC5E8zINYAaZfSXNWbmhX0rXCYpvM,9718
-angr/unicornlib.dylib,sha256=RTuxsysows9O6BGpxReji9XixmG73ZrwoTGqEim2mr0,264656
+angr/unicornlib.dylib,sha256=E4kM6p5IQ9XGbL7Zh12CarXRVNVKccJiNPqPjHH-VjQ,264656
 angr/state_hierarchy.py,sha256=qDQCUGXmQm3vOxE3CSoiqTH4OAFFOWZZt9BLhNpeOhA,8484
 angr/callable.py,sha256=j9Orwd4H4fPqOYylcEt5GuLGPV7ZOqyA_OYO2bp5PAA,6437
 angr/sim_type.py,sha256=Z0gWJaTVwjC6I_O7nzwa0DtEXZSFA9ekikm-U2gxCR4,135357
 angr/knowledge_base.py,sha256=hRoSLuLaOXmddTSF9FN5TVs7liftpBGq_IICz5AaYBk,4533
 angr/emulator.py,sha256=572e9l-N4VUzUzLKylqpv3JmBvVC5VExi1tLy6MZSoU,4633
-angr/rustylib.abi3.so,sha256=kRbdyqMQUXwmTaE3CojFoV1gWx_6LqoFkpfDdtCXQMo,5259644
+angr/rustylib.abi3.so,sha256=Df1Cq53wXQziP6KC27BS7ehr_LOVNNnMwBXNH7VuZMQ,5259788
 angr/codenode.py,sha256=hCrQRp4Ebb2X6JicNmY1PXo3_Pm8GDxVivVW0Pwe84k,3918
 angr/graph_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 angr/sim_manager.py,sha256=w7yTfWR-P9yoN5x85eeiNpj9dTrnjpJ3o5aoFpDAPnc,39396
 angr/serializable.py,sha256=l908phj_KcqopEEL_oCufbP_H6cm3Wc9v-5xdux1-6g,1533
 angr/code_location.py,sha256=kXNJDEMge9VRHadrK4E6HQ8wDdCaHSXNqyAZuHDEGuM,5397
-angr/__init__.py,sha256=R8Y4OScd7DXLUKwJ31WPkrpNOKLNUbJvO2wJsH9ZiJA,9246
+angr/__init__.py,sha256=ZeGnjkV15b26W_suDwvHXnFGn8nN22iB2dV9D0w5lW4,9246
 angr/blade.py,sha256=OGGW-oggqI9_LvgZhiQuh9Ktkvf3vhRBmH0XviNyZ6o,15801
 angr/factory.py,sha256=PPNWvTiWaIgzxzyoTr8ObSF-TXp1hCdbY2e-0xBePNc,17815
 angr/sim_state_options.py,sha256=dsMY3UefvL7yZKXloubMhzUET3N2Crw-Fpw2Vd1ouZQ,12468
@@ -1236,7 +1236,7 @@ angr/analyses/decompiler/decompilation_options.py,sha256=bs6CNpU3UxepgBB_9eUH4jr
 angr/analyses/decompiler/region_walker.py,sha256=u0hR0bEX1hSwkv-vejIM1gS-hcX2F2DLsDqpKhQ5_pQ,752
 angr/analyses/decompiler/graph_region.py,sha256=uSDdCLXfLZJVcb0wMdgBh-KtBJUUhLGHQ-Ap4dNs8wo,18186
 angr/analyses/decompiler/utils.py,sha256=kzHYCznq8rGmwNcjv7VZs3EteEG4a94EOX18jNXSrcE,42712
-angr/analyses/decompiler/decompiler.py,sha256=Mw1C-VPO283ghNS6P5KscjQLhH7Yj19SDCiSDzwU7ME,31716
+angr/analyses/decompiler/decompiler.py,sha256=adX2UJv6s4JAF7Qf6HTgwPo28QQ6yCzrrQrtlqDZyfE,31864
 angr/analyses/decompiler/goto_manager.py,sha256=wVoeXJcadIda84LloGgqW-rL0QHLv3fx4vZHLhmz-_o,4027
 angr/analyses/decompiler/block_similarity.py,sha256=S1lTlXFyOmJlQa7I3y7xgLsENLS4XGET7tdD55k_6Vg,6859
 angr/analyses/decompiler/ail_simplifier.py,sha256=s9hFXhNwU8fBKDOkw4vtSWhSWy9xBdF9p1463cO5930,93071
@@ -1356,7 +1356,7 @@ angr/analyses/decompiler/optimization_passes/condition_constprop.py,sha256=8UBN1
 angr/analyses/decompiler/optimization_passes/ret_deduplicator.py,sha256=hqOBkbiyQwGDoPdkMLwJjJOI_90QQ2R6ESs2HQ4z0iw,8005
 angr/analyses/decompiler/optimization_passes/ret_addr_save_simplifier.py,sha256=A7azHMeTQDXPFj44lI-mK7wnbJZ6cdSL-lwwqxiBTk0,6420
 angr/analyses/decompiler/optimization_passes/switch_default_case_duplicator.py,sha256=154pzAHjRaDJA1bc69Z49qDBouToemUL0BoT2ybmjw8,6476
-angr/analyses/decompiler/optimization_passes/__init__.py,sha256=y7ND9Wg98M5SoMGuOespoLeh1s-wFqKyeW2_4esDsiw,5236
+angr/analyses/decompiler/optimization_passes/__init__.py,sha256=v6LlcY49Z816sgba6FORCZUQ0XHtw58AztlZ9hsTtms,5354
 angr/analyses/decompiler/optimization_passes/ite_expr_converter.py,sha256=DA2H1Uk8ZUTBcebQ3SFFl5n8pDSsZnQZC1Hnjv-A1a0,7835
 angr/analyses/decompiler/optimization_passes/switch_reused_entry_rewriter.py,sha256=6-b3u4zCwSQkMaYXDP4aTjTZdFTlIWlYfd8zC1vNuRM,4035
 angr/analyses/decompiler/optimization_passes/tag_slicer.py,sha256=VSlwk9ZdnFZnAAxL0gUAgqAtP6HEk4fqcYGWlD3ylGg,1181
@@ -1374,6 +1374,7 @@ angr/analyses/decompiler/optimization_passes/eager_std_string_concatenation.py,s
 angr/analyses/decompiler/optimization_passes/return_duplicator_low.py,sha256=YHmS48Wyegq6Hb9pI9OKybFy9MWAo9r0ujDYJgykKk8,6866
 angr/analyses/decompiler/optimization_passes/code_motion.py,sha256=fdUvRseuFiH6ehpk9uWWMityDuBs_kqmIjYMi92dDkw,15353
 angr/analyses/decompiler/optimization_passes/stack_canary_simplifier.py,sha256=z8Fz1DXuwe0FVAvwPTJfrl6G9QsHoX0RI7gcB57jupU,14709
+angr/analyses/decompiler/optimization_passes/peephole_simplifier.py,sha256=4PeOX1al4raJ7QCVLyNcffF_Q5XnPS1vDwz4riNUeHQ,2672
 angr/analyses/decompiler/optimization_passes/base_ptr_save_simplifier.py,sha256=-kuCQk0ALYM1rmr6VaijrZYgHseeXqlWECaekKfI6hE,6120
 angr/analyses/decompiler/optimization_passes/x86_gcc_getpc_simplifier.py,sha256=aTQV3_yQaAKhQ24V66alxErjg7jv6gellWCqsT9G-lE,3104
 angr/analyses/decompiler/optimization_passes/mod_simplifier.py,sha256=9ekxyvxF8g3tN5oanUg96HaYiyYVbj5Nf-vSeeq86kI,3384
@@ -1390,10 +1391,10 @@ angr/analyses/decompiler/counters/seq_cf_structure_counter.py,sha256=gyNYOAo3bao
 angr/analyses/decompiler/counters/__init__.py,sha256=UT5K0cWgkVTAXZxy1qBBzrQip3YR2BOBVpxlAuNlt5o,480
 angr/analyses/decompiler/counters/boolean_counter.py,sha256=FG3M8dMpbU_WAyr8PV2iEI43OLUxoZ6JQ1johkMtivw,893
 angr/analyses/decompiler/presets/__init__.py,sha256=NWARH5yOyBz4-5qKhzH56PNfPNRViNKMDeESlpplFxo,375
-angr/analyses/decompiler/presets/preset.py,sha256=sTK5fJfx_Cdx0Gjn7y4bOrDp-2eFPeg1e1d5Eyc9uXk,1256
-angr/analyses/decompiler/presets/fast.py,sha256=52ZiYOp165AaCjRok6P7WP9HCzMMYgWX8kMQgTNKkTw,1542
-angr/analyses/decompiler/presets/full.py,sha256=NbyJ3h589kWlYL6uDz6rv0R9gkGqX2TF0i-OLZM3Jb4,1786
-angr/analyses/decompiler/presets/basic.py,sha256=KDHlMq_XWonN2-JIYYVIhbI6FbfzXttmkgXFrwi5MiA,803
+angr/analyses/decompiler/presets/preset.py,sha256=LvX7ydyO0ZzQsC0M2fy1wXA_0ygSqeP9P52VJAK0Eeo,1264
+angr/analyses/decompiler/presets/fast.py,sha256=0q9DEyWZOzt6MMJe2bb9LjlGrgv5NxgEjAb6Z1fah24,1636
+angr/analyses/decompiler/presets/full.py,sha256=j6ccrb3I8RFnxAZXbkdnMwCmG6AwIddP0qGD-7LzXz8,1880
+angr/analyses/decompiler/presets/basic.py,sha256=sHT2oalBmINVSZfpEbx4LmK0G1zqbZmLaVCAH-r-VDI,897
 angr/analyses/s_reaching_definitions/__init__.py,sha256=TyfVplxkJj8FAAAw9wegzJlcrbGwlFpIB23PdCcwrLA,254
 angr/analyses/s_reaching_definitions/s_reaching_definitions.py,sha256=gNdg8xpu5by_McWU8j0g0502yQsO2evkTlben9yimV0,7826
 angr/analyses/s_reaching_definitions/s_rda_model.py,sha256=FJSge_31FFzyzBJA1xm7dQz40TfuNna6v_RWAZMZvi0,5801