Skip to content

gh-105481: add flags to each instr in the opcode metadata table, to replace opcode.hasarg/hasname/hasconst #105482

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
iritkatriel merged 10 commits into from
Jun 13, 2023
Merged

gh-105481: add flags to each instr in the opcode metadata table, to replace opcode.hasarg/hasname/hasconst #105482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0898ab
gh-105481: add flags to each instr in the opcode metadata table, to r…
iritkatriel Jun 7, 2023
35430de
emit symbolic flags
iritkatriel Jun 8, 2023
fdce9f4
add macros CO_CONSTS, CO_NAMES
iritkatriel Jun 8, 2023
14fa4c6
code review comments
iritkatriel Jun 13, 2023
bf9df5f
Merge remote-tracking branch 'upstream/main' into metadata
iritkatriel Jun 13, 2023
e93f976
enable asseertions for pseudo-ops as well
iritkatriel Jun 13, 2023
fe06e04
remove delim arg
iritkatriel Jun 13, 2023
0d3dc8e
forbid reserved words 'co_consts', 'co_names'
iritkatriel Jun 13, 2023
33dfd3e
change order of args to PseudoInstruction
iritkatriel Jun 13, 2023
33abc4a
Merge branch 'main' into metadata
iritkatriel Jun 13, 2023
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
1 change: 1 addition & 0 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,7 @@ dummy_func(
// NOTE: It's important that YIELD_VALUE never raises an exception!
// The compiler treats any exception raised here as a failed close()
// or throw() call.
assert(oparg >= 0); /* make the generator identify this as HAS_ARG */
Comment thread
iritkatriel marked this conversation as resolved.
Resolved
assert(frame != &entry_frame);
PyGenObject *gen = _PyFrame_GetGenerator(frame);
gen->gi_frame_state = FRAME_SUSPENDED;
Expand Down
4 changes: 4 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,10 @@ instr_sequence_use_label(instr_sequence *seq, int lbl) {
static int
instr_sequence_addop(instr_sequence *seq, int opcode, int oparg, location loc)
{
if (!IS_PSEUDO_OPCODE(opcode)) {
assert(!HAS_ARG(opcode) == !OPCODE_HAS_ARG(opcode));
assert(!HAS_CONST(opcode) == !OPCODE_HAS_CONST(opcode));
Comment thread
iritkatriel marked this conversation as resolved.
Resolved
}
assert(IS_WITHIN_OPCODE_RANGE(opcode));
assert(HAS_ARG(opcode) || HAS_TARGET(opcode) || oparg == 0);
assert(0 <= oparg && oparg < (1 << 30));
Expand Down
Loading