bytecode 0.16.1__tar.gz → 0.16.2__tar.gz

{bytecode-0.16.1 → bytecode-0.16.2}/.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: cibw-*
           path: dist
@@ -101,7 +101,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4.1.8
+      uses: actions/download-artifact@v4.2.1
       with:
         pattern: cibw-*
         path: dist

{bytecode-0.16.1/src/bytecode.egg-info → bytecode-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bytecode
-Version: 0.16.1
+Version: 0.16.2
 Summary: Python module to generate and modify bytecode
 Author-email: Victor Stinner <victor.stinner@gmail.com>
 Maintainer-email: "Matthieu C. Dartiailh" <m.dartiailh@gmail.com>
@@ -47,6 +47,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: typing_extensions; python_version < "3.10"
+Dynamic: license-file
 
 ********
 bytecode

{bytecode-0.16.1 → bytecode-0.16.2}/doc/changelog.rst

@@ -1,6 +1,14 @@
 ChangeLog
 =========
 
+2025-04-14: Version 0.16.2
+--------------------------
+
+Bugfixes:
+
+- fix ControlFlowGraph dead block detection by accounting for fall-through
+  edges. PR #161
+
 2025-01-21: Version 0.16.1
 --------------------------
 

{bytecode-0.16.1 → bytecode-0.16.2}/src/bytecode/cfg.py

@@ -731,12 +731,18 @@ class ControlFlowGraph(_bytecode.BaseBytecode):
             if id(block) in seen_block_ids:
                 continue
             seen_block_ids.add(id(block))
+            fall_through = True
             for i in block:
-                if isinstance(i, Instr) and isinstance(i.arg, BasicBlock):
-                    stack.append(i.arg)
+                if isinstance(i, Instr):
+                    if isinstance(i.arg, BasicBlock):
+                        stack.append(i.arg)
+                    if i.is_final():
+                        fall_through = False
                 elif isinstance(i, TryBegin):
                     assert isinstance(i.target, BasicBlock)
                     stack.append(i.target)
+            if fall_through and block.next_block:
+                stack.append(block.next_block)
 
         return [b for b in self if id(b) not in seen_block_ids]
 

{bytecode-0.16.1 → bytecode-0.16.2}/src/bytecode/instr.py

@@ -336,15 +336,15 @@ STATIC_STACK_EFFECTS: Dict[str, Tuple[int, int]] = {
     "CHECK_EXC_MATCH": (-2, 2),  # (TOS1, TOS) -> (TOS1, bool)
     "CHECK_EG_MATCH": (-2, 2),  # (TOS, TOS1) -> non-matched, matched or TOS1, None)
     "PREP_RERAISE_STAR": (-2, 1),  # (TOS1, TOS) -> new exception group)
-    **{k: (-1, 1) for k in (o for o in _opcode.opmap if (o.startswith("UNARY_")))},
-    **{
-        k: (-2, 1)
-        for k in (
+    **dict.fromkeys((o for o in _opcode.opmap if o.startswith("UNARY_")), (-1, 1)),
+    **dict.fromkeys(
+        (
             o
             for o in _opcode.opmap
-            if (o.startswith("BINARY_") or o.startswith("INPLACE_"))
-        )
-    },
+            if o.startswith("BINARY_") or o.startswith("INPLACE_")
+        ),
+        (-2, 1),
+    ),
     # Python 3.12 changes not covered by dis.stack_effect
     "BINARY_SLICE": (-3, 1),
     # "STORE_SLICE" handled by dis.stack_effect

{bytecode-0.16.1 → bytecode-0.16.2}/src/bytecode/version.py

@@ -5,7 +5,7 @@ from collections import namedtuple
 #: A namedtuple of the version info for the current release.
 _version_info = namedtuple("_version_info", "major minor micro status")
 
-parts = "0.16.1".split(".", 3)
+parts = "0.16.2".split(".", 3)
 version_info = _version_info(
     int(parts[0]),
     int(parts[1]),
@@ -16,4 +16,4 @@ version_info = _version_info(
 # Remove everything but the 'version_info' from this module.
 del namedtuple, _version_info, parts
 
-__version__ = "0.16.1"
+__version__ = "0.16.2"

{bytecode-0.16.1 → bytecode-0.16.2/src/bytecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: bytecode
-Version: 0.16.1
+Version: 0.16.2
 Summary: Python module to generate and modify bytecode
 Author-email: Victor Stinner <victor.stinner@gmail.com>
 Maintainer-email: "Matthieu C. Dartiailh" <m.dartiailh@gmail.com>
@@ -47,6 +47,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: COPYING
 Requires-Dist: typing_extensions; python_version < "3.10"
+Dynamic: license-file
 
 ********
 bytecode

{bytecode-0.16.1 → bytecode-0.16.2}/tests/test_cfg.py

@@ -712,6 +712,20 @@ class BytecodeBlocksFunctionalTests(TestCase):
         other_block = BasicBlock()
         self.assertRaises(ValueError, blocks.get_block_index, other_block)
 
+    def test_get_dead_blocks(self):
+        def condition():
+            pass
+
+        def test():
+            if condition():
+                print("1")
+            else:
+                print("2")
+
+        bytecode = Bytecode.from_code(test.__code__)
+        cfg = ControlFlowGraph.from_bytecode(bytecode)
+        assert len(cfg.get_dead_blocks()) == 0
+
 
 class CFGStacksizeComputationTests(TestCase):
     def check_stack_size(self, func):