NotificationsYou must be signed in to change notification settings
Fork32k
Star67.3k

gh-105481: add OPCODE_IS_INSTRUMENTED (generated from bytecodes.c) to replace MIN_INSTRUMENTED_OPCODE (defined in opcode.py)#107276

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Closed

iritkatriel wants to merge4 commits intopython:mainfromiritkatriel:instrumented

Closed

gh-105481: add OPCODE_IS_INSTRUMENTED (generated from bytecodes.c) to replace MIN_INSTRUMENTED_OPCODE (defined in opcode.py)#107276

iritkatriel wants to merge4 commits intopython:mainfromiritkatriel:instrumented

Conversation

Copy link

Member

iritkatriel commentedJul 25, 2023•
edited by bedevere-bot
Loading

Issue:Generate opcode metadata from bytecodes.c instead of opcode.py #105481

pythongh-105481: add OPCODE_IS_INSTRUMENTED (generated from bytecodes…

d642083

….c) to replace MIN_INSTRUMENTED_OPCODE (defined in opcode.py)

iritkatriel requested a review fromgvanrossum

July 25, 2023 22:49

iritkatriel requested a review frommarkshannon as acode owner

July 25, 2023 22:49

bedevere-bot mentioned this pull request

Jul 20, 2023

Generate opcode metadata from bytecodes.c instead of opcode.py#105481

Closed

bedevere-bot added the awaiting core review label

Jul 25, 2023

regen-all

f7ae491

iritkatriel added the skip news label

Jul 26, 2023

fix test__opcode. Special case INSTRUMENTED_LINE in generator

02f7a9f

iritkatriel force-pushed theinstrumented branch from91ef606 to02f7a9fCompare

July 26, 2023 12:58

Merge remote-tracking branch 'upstream/main' into instrumented

c12c317

iritkatriel commented

Jul 26, 2023

View reviewed changes

Tools/cases_generator/generate_cases.py

		@@ -283,7 +283,8 @@ def write_metadata(self, metadata_filename: str, pymetadata_filename: str) -> No
		self.out.emit(
		"#define IS_VALID_OPCODE(OP) \\\n"
		" (((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \\\n"
		" (_PyOpcode_opcode_metadata[(OP)].valid_entry))"
		" (_PyOpcode_opcode_metadata[(OP)].valid_entry)) \|\| \\\n"
		" ((OP) == INSTRUMENTED_LINE)" # implemented in ceval.c, not bytecodes.c

Copy link

MemberAuthor

iritkatrielJul 26, 2023•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I had to special-case INSTRUMENTED_LINE because it's implemented in ceval.c rather than bytecodes.c, so doesn't appear in the metadata. We could instead do something else like add it to the instr list after bytecode.c is parsed. I'm not sure which option is less bad.