Skip to content

gh-115796: fix exception table construction in _testinternalcapi.assemble_code_object #115797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2024
Merged

gh-115796: fix exception table construction in _testinternalcapi.assemble_code_object #115797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions Lib/test/test_compiler_assemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import dis
import io
import textwrap
import types

from test.support.bytecode_helper import AssemblerTestCase
Expand All @@ -22,11 +25,13 @@ def complete_metadata(self, metadata, filename="myfile.py"):
metadata.setdefault('filename', filename)
return metadata

def assemble_test(self, insts, metadata, expected):
def insts_to_code_object(self, insts, metadata):
metadata = self.complete_metadata(metadata)
insts = self.complete_insts_info(insts)
return self.get_code_object(metadata['filename'], insts, metadata)

co = self.get_code_object(metadata['filename'], insts, metadata)
def assemble_test(self, insts, metadata, expected):
co = self.insts_to_code_object(insts, metadata)
self.assertIsInstance(co, types.CodeType)

expected_metadata = {}
Expand Down Expand Up @@ -108,3 +113,35 @@ def inner():

expected = {(0,): 0, (1,): 1, (2,): 0, (120,): 0, (121,): 1}
self.assemble_test(instructions, metadata, expected)


def test_exception_table(self):
metadata = {
'filename' : 'exc.py',
'name' : 'exc',
'consts' : {2 : 0},
}

# code for "try: pass\n except: pass"
insts = [
('RESUME', 0),
('SETUP_FINALLY', 3),
('RETURN_CONST', 0),
('SETUP_CLEANUP', 8),
('PUSH_EXC_INFO', 0),
('POP_TOP', 0),
('POP_EXCEPT', 0),
('RETURN_CONST', 0),
('COPY', 3),
('POP_EXCEPT', 0),
('RERAISE', 1),
]
co = self.insts_to_code_object(insts, metadata)
output = io.StringIO()
dis.dis(co, file=output)
exc_table = textwrap.dedent("""
ExceptionTable:
L1 to L2 -> L2 [0]
L2 to L3 -> L3 [1] lasti
""")
self.assertTrue(output.getvalue().endswith(exc_table))
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tests/2024-02-22-00-17-06.gh-issue-115796.d4hpKy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Make '_testinternalcapi.assemble_code_object' construct the exception table
for the code object.
17 changes: 11 additions & 6 deletions Python/flowgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,6 @@ translate_jump_labels_to_targets(basicblock *entryblock)
return SUCCESS;
}

int
_PyCfg_JumpLabelsToTargets(cfg_builder *g)
{
return translate_jump_labels_to_targets(g->g_entryblock);
}

static int
mark_except_handlers(basicblock *entryblock) {
#ifndef NDEBUG
Expand Down Expand Up @@ -2790,3 +2784,14 @@ _PyCfg_OptimizedCfgToInstructionSequence(cfg_builder *g,

return SUCCESS;
}

/* This is used by _PyCompile_Assemble to fill in the jump and exception
* targets in a synthetic CFG (which is not the ouptut of the builtin compiler).
*/
int
_PyCfg_JumpLabelsToTargets(cfg_builder *g)
{
RETURN_IF_ERROR(translate_jump_labels_to_targets(g->g_entryblock));
RETURN_IF_ERROR(label_exception_targets(g->g_entryblock));
return SUCCESS;
}