Skip to content
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

gh-101907: Removes use of non-standard C++ extension from Include/cpython/code.h #101909

Closed
wants to merge 2 commits into from
Closed

gh-101907: Removes use of non-standard C++ extension from Include/cpython/code.h #101909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f5d7cb
gh-101907: Removes use of non-standard C++ extension from Include/cpy…
zooba Feb 14, 2023
5005130
Use SET macros instead
zooba Feb 14, 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
18 changes: 13 additions & 5 deletions Include/cpython/code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,27 @@ typedef union {
struct {
uint8_t opcode;
uint8_t oparg;
};
} _op;
} _Py_CODEUNIT;

#define _Py_OPCODE(word) ((word).opcode)
#define _Py_OPARG(word) ((word).oparg)
#define _Py_OPCODE(word) ((word)._op.opcode)
#define _Py_OPARG(word) ((word)._op.oparg)

static inline void
_py_set_opcode(_Py_CODEUNIT *word, uint8_t opcode)
{
word->opcode = opcode;
word->_op.opcode = opcode;
}

#define _Py_SET_OPCODE(word, opcode) _py_set_opocde(&(word), opcode)
#define _Py_SET_OPCODE(word, opcode) _py_set_opcode(&(word), opcode)

static inline void
_py_set_oparg(_Py_CODEUNIT *word, uint8_t oparg)
{
word->_op.oparg = oparg;
}

#define _Py_SET_OPARG(word, opcode) _py_set_oparg(&(word), opcode)

typedef struct {
PyObject *_co_code;
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C API/2023-02-14-15-53-01.gh-issue-101907.HgF1N2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Removes use of non-standard C++ extension in public header files.
10 changes: 5 additions & 5 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,10 +1507,10 @@ deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)
_Py_CODEUNIT instruction = instructions[i];
int opcode = _PyOpcode_Deopt[_Py_OPCODE(instruction)];
int caches = _PyOpcode_Caches[opcode];
instructions[i].opcode = opcode;
_Py_SET_OPCODE(instructions[i], opcode);
while (caches--) {
instructions[++i].opcode = CACHE;
instructions[i].oparg = 0;
_Py_SET_OPCODE(instructions[++i], CACHE);
_Py_SET_OPARG(instructions[i], 0);
}
}
}
Expand Down Expand Up @@ -1763,8 +1763,8 @@ code_richcompare(PyObject *self, PyObject *other, int op)
for (int i = 0; i < Py_SIZE(co); i++) {
_Py_CODEUNIT co_instr = _PyCode_CODE(co)[i];
_Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i];
co_instr.opcode = _PyOpcode_Deopt[_Py_OPCODE(co_instr)];
cp_instr.opcode =_PyOpcode_Deopt[_Py_OPCODE(cp_instr)];
_Py_SET_OPCODE(co_instr, _PyOpcode_Deopt[_Py_OPCODE(co_instr)]);
_Py_SET_OPCODE(cp_instr, _PyOpcode_Deopt[_Py_OPCODE(cp_instr)]);
eq = co_instr.cache == cp_instr.cache;
if (!eq) {
goto unequal;
Expand Down
6 changes: 3 additions & 3 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,9 @@ gen_close(PyGenObject *gen, PyObject *args)
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)gen->gi_iframe;
/* It is possible for the previous instruction to not be a
* YIELD_VALUE if the debugger has changed the lineno. */
if (err == 0 && frame->prev_instr->opcode == YIELD_VALUE) {
assert(frame->prev_instr[1].opcode == RESUME);
int exception_handler_depth = frame->prev_instr->oparg;
if (err == 0 && _Py_OPCODE(frame->prev_instr[0]) == YIELD_VALUE) {
assert(_Py_OPCODE(frame->prev_instr[1]) == RESUME);
int exception_handler_depth = _Py_OPCODE(frame->prev_instr[0]);
assert(exception_handler_depth > 0);
/* We can safely ignore the outermost try block
* as it automatically generated to handle
Expand Down
20 changes: 10 additions & 10 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,31 +274,31 @@ write_instr(_Py_CODEUNIT *codestr, struct instr *instruction, int ilen)
int caches = _PyOpcode_Caches[opcode];
switch (ilen - caches) {
case 4:
codestr->opcode = EXTENDED_ARG;
codestr->oparg = (oparg >> 24) & 0xFF;
_Py_SET_OPCODE(*codestr, EXTENDED_ARG);
_Py_SET_OPARG(*codestr, (oparg >> 24) & 0xFF);
codestr++;
/* fall through */
case 3:
codestr->opcode = EXTENDED_ARG;
codestr->oparg = (oparg >> 16) & 0xFF;
_Py_SET_OPCODE(*codestr, EXTENDED_ARG);
_Py_SET_OPARG(*codestr, (oparg >> 16) & 0xFF);
codestr++;
/* fall through */
case 2:
codestr->opcode = EXTENDED_ARG;
codestr->oparg = (oparg >> 8) & 0xFF;
_Py_SET_OPCODE(*codestr, EXTENDED_ARG);
_Py_SET_OPARG(*codestr, (oparg >> 8) & 0xFF);
codestr++;
/* fall through */
case 1:
codestr->opcode = opcode;
codestr->oparg = oparg & 0xFF;
_Py_SET_OPCODE(*codestr, opcode);
_Py_SET_OPARG(*codestr, oparg & 0xFF);
codestr++;
break;
default:
Py_UNREACHABLE();
}
while (caches--) {
codestr->opcode = CACHE;
codestr->oparg = 0;
_Py_SET_OPCODE(*codestr, CACHE);
_Py_SET_OPARG(*codestr, 0);
codestr++;
}
}
Expand Down
16 changes: 8 additions & 8 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,31 +291,31 @@ _PyCode_Quicken(PyCodeObject *code)
}
switch (previous_opcode << 8 | opcode) {
case LOAD_CONST << 8 | LOAD_FAST:
instructions[i - 1].opcode = LOAD_CONST__LOAD_FAST;
_Py_SET_OPCODE(instructions[i - 1], LOAD_CONST__LOAD_FAST);
break;
case LOAD_FAST << 8 | LOAD_CONST:
instructions[i - 1].opcode = LOAD_FAST__LOAD_CONST;
_Py_SET_OPCODE(instructions[i - 1], LOAD_FAST__LOAD_CONST);
break;
case LOAD_FAST << 8 | LOAD_FAST:
instructions[i - 1].opcode = LOAD_FAST__LOAD_FAST;
_Py_SET_OPCODE(instructions[i - 1], LOAD_FAST__LOAD_FAST);
break;
case STORE_FAST << 8 | LOAD_FAST:
instructions[i - 1].opcode = STORE_FAST__LOAD_FAST;
_Py_SET_OPCODE(instructions[i - 1], STORE_FAST__LOAD_FAST);
break;
case STORE_FAST << 8 | STORE_FAST:
instructions[i - 1].opcode = STORE_FAST__STORE_FAST;
_Py_SET_OPCODE(instructions[i - 1], STORE_FAST__STORE_FAST);
break;
case COMPARE_OP << 8 | POP_JUMP_IF_TRUE:
case COMPARE_OP << 8 | POP_JUMP_IF_FALSE:
{
int oparg = instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP].oparg;
int oparg = _Py_OPARG(instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP]);
assert((oparg >> 4) <= Py_GE);
int mask = compare_masks[oparg >> 4];
if (opcode == POP_JUMP_IF_FALSE) {
mask = mask ^ 0xf;
}
instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP].opcode = COMPARE_AND_BRANCH;
instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP].oparg = (oparg & 0xf0) | mask;
_Py_SET_OPCODE(instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP], COMPARE_AND_BRANCH);
_Py_SET_OPARG(instructions[i - 1 - INLINE_CACHE_ENTRIES_COMPARE_OP], (oparg & 0xf0) | mask);
break;
}
}
Expand Down