angr 9.2.170__cp310-abi3-win_amd64.whl → 9.2.172__cp310-abi3-win_amd64.whl

angr/__init__.py

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

angr/analyses/cfg/cfb.py

@@ -155,7 +155,7 @@ class CFBlanket(Analysis):
                     self._regions.append(mr)
             elif isinstance(obj, ExternObject):
                 if "extern" not in self._exclude_region_types:
-                    size = obj.max_addr - obj.min_addr
+                    size = obj.next_addr
                     mr = MemoryRegion(obj.min_addr, size, "extern", obj, None)
                     self._regions.append(mr)
             elif isinstance(obj, ELFTLSObject):

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.170.dist-info → angr-9.2.172.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: angr
-Version: 9.2.170
+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.170
+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.170
-Requires-Dist: cle==9.2.170
+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.170
+Requires-Dist: pyvex==9.2.172
 Requires-Dist: rich>=13.1.0
 Requires-Dist: sortedcontainers
 Requires-Dist: sympy

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

@@ -1,4 +1,4 @@
-angr/__init__.py,sha256=keS-cXXMrR19-dZYM2Qxu3Ci0aMvAIvhn26i5d-EcV0,9246
+angr/__init__.py,sha256=ZeGnjkV15b26W_suDwvHXnFGn8nN22iB2dV9D0w5lW4,9246
 angr/__main__.py,sha256=AK9V6uPZ58UuTKmmiH_Kgn5pG9AvjnmJCPOku69A-WU,4993
 angr/annocfg.py,sha256=0NIvcuCskwz45hbBzigUTAuCrYutjDMwEXtMJf0y0S0,10742
 angr/blade.py,sha256=OGGW-oggqI9_LvgZhiQuh9Ktkvf3vhRBmH0XviNyZ6o,15801
@@ -15,7 +15,7 @@ angr/keyed_region.py,sha256=Cx6dadqFgEvRmEHTbCJpg9mXkBtKGc_BKckHc6bk1IU,17992
 angr/knowledge_base.py,sha256=hRoSLuLaOXmddTSF9FN5TVs7liftpBGq_IICz5AaYBk,4533
 angr/project.py,sha256=AJmBgv3U8iv-hGEfnpmESVVjK16NiBAemmahLuqz7yk,38096
 angr/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-angr/rustylib.pyd,sha256=W8sVhtq3yhEa4Irb1A6cupY7tOd3e1veF627jbZdFVk,4466688
+angr/rustylib.pyd,sha256=X-LW9eTPpVuP4tYisjR_7usNDOsPWObPbEl_ULvIE6Y,4466688
 angr/serializable.py,sha256=l908phj_KcqopEEL_oCufbP_H6cm3Wc9v-5xdux1-6g,1533
 angr/sim_manager.py,sha256=w7yTfWR-P9yoN5x85eeiNpj9dTrnjpJ3o5aoFpDAPnc,39396
 angr/sim_options.py,sha256=tfl57MFECmA7uvMMtQrRRbpG8g_A9jKOzwY6nApTW6Y,17782
@@ -27,7 +27,7 @@ angr/sim_variable.py,sha256=3DssmMw5G7m_-MYToJ3LBP-ooy2UQEuI2YgxIuX3d4Y,13177
 angr/slicer.py,sha256=DND0BERanYKafasRH9MDFAng0rSjdjmzXj2-phCD6CQ,10634
 angr/state_hierarchy.py,sha256=qDQCUGXmQm3vOxE3CSoiqTH4OAFFOWZZt9BLhNpeOhA,8484
 angr/tablespecs.py,sha256=Kx1e87FxTx3_ZN7cAHWZSRpdInT4Vfj5gExAWtLkLTw,3259
-angr/unicornlib.dll,sha256=hnHg6wObmXg83Tp7IOAobbeV5lf6-p-6h2dBPvdTamY,813568
+angr/unicornlib.dll,sha256=Iigc3QczuAVV_SzTx9yu0MnTRQFJR5qT5yM010wqFNY,813568
 angr/vaults.py,sha256=D_gkDegCyPlZMKGC5E8zINYAaZfSXNWbmhX0rXCYpvM,9718
 angr/ailment/__init__.py,sha256=X1LTS6MuTovGtbXBjZendUVOzRk-ib-bP0imuqJDOYI,2039
 angr/ailment/block.py,sha256=rkmimsNPhrUabVVbRd2IgCaW0hA2_isvAsKlYtHZhgY,2428
@@ -83,7 +83,7 @@ angr/analyses/calling_convention/calling_convention.py,sha256=vdGqrv7SQDnO6Rg9rg
 angr/analyses/calling_convention/fact_collector.py,sha256=SCdNm-6qfgj-SRnbtPpzzkZBS0nH0Ik3zPn5wLG6-7Y,28480
 angr/analyses/calling_convention/utils.py,sha256=twkO073RvkkFXnOTc-KYQT1GKUtz0OPjxh0N6AWIriQ,2110
 angr/analyses/cfg/__init__.py,sha256=-w8Vd6FD6rtjlQaQ7MxwmliFgS2zt-kZepAY4gHas04,446
-angr/analyses/cfg/cfb.py,sha256=7JibFw5NyGWIbZnWMn7NS0zOqpB5s3KvxRoK8bEJOOs,15367
+angr/analyses/cfg/cfb.py,sha256=HI25OJKs2OUlWkOSG4kLsZQFnBJcfDwSQKp6_ZRsoQY,15353
 angr/analyses/cfg/cfg.py,sha256=dc9M91CaLeEKduYfMwpsT_01x6XyYuoNvgvcDKtbN-I,3177
 angr/analyses/cfg/cfg_arch_options.py,sha256=_XRewFZ51SeNaxChadb6_ER7-8LW8KXeTIpoP8_iRj0,3506
 angr/analyses/cfg/cfg_base.py,sha256=eleUmM_znfsl6KV7T2tUmSEy2iLmPsrT3dNB2BYudd4,124964
@@ -126,7 +126,7 @@ angr/analyses/decompiler/clinic.py,sha256=rGR5ODSEZyHX1cmEuUNPKxK3BNcVAg-97Tlppx
 angr/analyses/decompiler/condition_processor.py,sha256=ALx1EO82EWOfj1mjWhS_8GNMLdEO98jqnIqB-CtfELg,56692
 angr/analyses/decompiler/decompilation_cache.py,sha256=06oiG299mVpGOTL54Xy1CUxz5s8QLgYJn5XIvKFLYkU,1566
 angr/analyses/decompiler/decompilation_options.py,sha256=bs6CNpU3UxepgBB_9eUH4jriNpGoryyPP0sR1hDWpTk,8477
-angr/analyses/decompiler/decompiler.py,sha256=Mw1C-VPO283ghNS6P5KscjQLhH7Yj19SDCiSDzwU7ME,31716
+angr/analyses/decompiler/decompiler.py,sha256=adX2UJv6s4JAF7Qf6HTgwPo28QQ6yCzrrQrtlqDZyfE,31864
 angr/analyses/decompiler/empty_node_remover.py,sha256=4CdxTM1AVmRoEdRIwJg1YEy10AgkEoRmJ8SU7xGbKnM,7424
 angr/analyses/decompiler/expression_narrower.py,sha256=lBtcsPu4V5JJ_u25GF-BJ3vaybu8TRr9XxmnjOrA4J8,10367
 angr/analyses/decompiler/goto_manager.py,sha256=wVoeXJcadIda84LloGgqW-rL0QHLv3fx4vZHLhmz-_o,4027
@@ -162,7 +162,7 @@ angr/analyses/decompiler/dephication/seqnode_dephication.py,sha256=kigkzU78eNe-z
 angr/analyses/decompiler/notes/__init__.py,sha256=4e5yTEQr5tnTQt8BfsMXqRUUpWPaQIFLzsgNVx55VJw,181
 angr/analyses/decompiler/notes/decompilation_note.py,sha256=MTFHVMlfmJGrKGuvlHppcIEFR1FWF9xW8_0U0xoFOUo,1352
 angr/analyses/decompiler/notes/deobfuscated_strings.py,sha256=f9AtSSVIB7kAlPUlkLxqNodco4KWbYivPV3Yh8KjVTo,1877
-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/base_ptr_save_simplifier.py,sha256=-kuCQk0ALYM1rmr6VaijrZYgHseeXqlWECaekKfI6hE,6120
 angr/analyses/decompiler/optimization_passes/call_stmt_rewriter.py,sha256=INLmzfGDMsVzyQF2S6uwiQSoNcxM7DUBJrdWlL2gqlY,1325
 angr/analyses/decompiler/optimization_passes/code_motion.py,sha256=fdUvRseuFiH6ehpk9uWWMityDuBs_kqmIjYMi92dDkw,15353
@@ -183,6 +183,7 @@ angr/analyses/decompiler/optimization_passes/ite_region_converter.py,sha256=8Q2Y
 angr/analyses/decompiler/optimization_passes/lowered_switch_simplifier.py,sha256=_p9puK2bvp055mqSW28QIqXWpZD-OpsunWPQrOWmT9Q,42130
 angr/analyses/decompiler/optimization_passes/mod_simplifier.py,sha256=9ekxyvxF8g3tN5oanUg96HaYiyYVbj5Nf-vSeeq86kI,3384
 angr/analyses/decompiler/optimization_passes/optimization_pass.py,sha256=VGpCQmx8H2w3HoVFGdqwYYZ0z_IdHrFjOhz37yvxxTQ,28169
+angr/analyses/decompiler/optimization_passes/peephole_simplifier.py,sha256=4PeOX1al4raJ7QCVLyNcffF_Q5XnPS1vDwz4riNUeHQ,2672
 angr/analyses/decompiler/optimization_passes/register_save_area_simplifier.py,sha256=-MoVamrPN9fMakQMZPwRYQ5rbeuQURXvyELuUhPVXKI,9088
 angr/analyses/decompiler/optimization_passes/ret_addr_save_simplifier.py,sha256=A7azHMeTQDXPFj44lI-mK7wnbJZ6cdSL-lwwqxiBTk0,6420
 angr/analyses/decompiler/optimization_passes/ret_deduplicator.py,sha256=hqOBkbiyQwGDoPdkMLwJjJOI_90QQ2R6ESs2HQ4z0iw,8005
@@ -258,10 +259,10 @@ angr/analyses/decompiler/peephole_optimizations/single_bit_xor.py,sha256=lxDgPnn
 angr/analyses/decompiler/peephole_optimizations/tidy_stack_addr.py,sha256=8gPWhFTcezgO7pZ_v0pxR7pweds4_GrrY82ur6Nrlf8,4796
 angr/analyses/decompiler/peephole_optimizations/utils.py,sha256=KYDiAt0PUA4PcOlBK-OS0aBr16_ZSETMISPAnaUJiLM,724
 angr/analyses/decompiler/presets/__init__.py,sha256=NWARH5yOyBz4-5qKhzH56PNfPNRViNKMDeESlpplFxo,375
-angr/analyses/decompiler/presets/basic.py,sha256=KDHlMq_XWonN2-JIYYVIhbI6FbfzXttmkgXFrwi5MiA,803
-angr/analyses/decompiler/presets/fast.py,sha256=52ZiYOp165AaCjRok6P7WP9HCzMMYgWX8kMQgTNKkTw,1542
-angr/analyses/decompiler/presets/full.py,sha256=NbyJ3h589kWlYL6uDz6rv0R9gkGqX2TF0i-OLZM3Jb4,1786
-angr/analyses/decompiler/presets/preset.py,sha256=sTK5fJfx_Cdx0Gjn7y4bOrDp-2eFPeg1e1d5Eyc9uXk,1256
+angr/analyses/decompiler/presets/basic.py,sha256=sHT2oalBmINVSZfpEbx4LmK0G1zqbZmLaVCAH-r-VDI,897
+angr/analyses/decompiler/presets/fast.py,sha256=0q9DEyWZOzt6MMJe2bb9LjlGrgv5NxgEjAb6Z1fah24,1636
+angr/analyses/decompiler/presets/full.py,sha256=j6ccrb3I8RFnxAZXbkdnMwCmG6AwIddP0qGD-7LzXz8,1880
+angr/analyses/decompiler/presets/preset.py,sha256=LvX7ydyO0ZzQsC0M2fy1wXA_0ygSqeP9P52VJAK0Eeo,1264
 angr/analyses/decompiler/region_simplifiers/__init__.py,sha256=BSD9osrReTEdapOMmyI1kFiN7AmE1EeJGLBV7i0u-Uc,117
 angr/analyses/decompiler/region_simplifiers/cascading_cond_transformer.py,sha256=xVY1NUqFudjdcFFO5RAfbdIlHyCRPLYDVPM8Z4J6uic,3832
 angr/analyses/decompiler/region_simplifiers/cascading_ifs.py,sha256=kPWajH8__ap-7713B-rT3Dun_O1gYW-AoS5gJHRoMlY,2610
@@ -1405,9 +1406,9 @@ angr/utils/vex.py,sha256=epcrCexi_NjKnPGM2gfpiRsUea_Scd-71UMuF32ZAQo,306
 angr/utils/ssa/__init__.py,sha256=xbuVllFoPane9lHACdRQP5OO99Mca-4sqpFrtoAvnxo,17464
 angr/utils/ssa/tmp_uses_collector.py,sha256=digAUQpYoFR1VYfwoXlF3T1pYdDi6Pdq_ck54SjMabQ,813
 angr/utils/ssa/vvar_uses_collector.py,sha256=HewqUQluNE9EsaiLeFo7LaBvws_DDBDYNt9RBExy464,1367
-angr-9.2.170.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
-angr-9.2.170.dist-info/METADATA,sha256=pfK7dUeXuyqoJW4QQoWrpHFJbhrAsEh8tGiLR4N8kqM,4453
-angr-9.2.170.dist-info/WHEEL,sha256=OJ2zpOfp3Fst0GC5jHtFuY8tAf46LLgZ9O920dE4b3c,100
-angr-9.2.170.dist-info/entry_points.txt,sha256=Vjh1C8PMyr5dZFMnik5WkEP01Uwr2T73I3a6N32sgQU,44
-angr-9.2.170.dist-info/top_level.txt,sha256=dKw0KWTbwLXytFvv15oAAG4sUs3ey47tt6DorJG9-hw,5
-angr-9.2.170.dist-info/RECORD,,
+angr-9.2.172.dist-info/licenses/LICENSE,sha256=PmWf0IlSz6Jjp9n7nyyBQA79Q5C2ma68LRykY1V3GF0,1456
+angr-9.2.172.dist-info/METADATA,sha256=kzqu9NoWtjz8McDJyDcFq-nxvTRXCmdaYSCKMvm_Znc,4453
+angr-9.2.172.dist-info/WHEEL,sha256=OJ2zpOfp3Fst0GC5jHtFuY8tAf46LLgZ9O920dE4b3c,100
+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/RECORD,,