Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Modules/unicodedata.c
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ _getcode(const char* name, int namelen, Py_UCS4* code)
}

if (i < (int)Py_ARRAY_LENGTH(derived_name_prefixes)) {
Py_UCS4 v = parse_hex_code(name + prefixlen, namelen - prefixlen);
Py_UCS4 v = parse_hex_code(name + prefixlen, namelen - (int)prefixlen);
if (find_prefix_id(v) != i) {
return 0;
}
Expand Down
4 changes: 3 additions & 1 deletion Python/optimizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

#define _PyExecutorObject_CAST(op) ((_PyExecutorObject *)(op))

#ifndef Py_GIL_DISABLED
static bool
has_space_for_executor(PyCodeObject *code, _Py_CODEUNIT *instr)
{
Expand Down Expand Up @@ -110,6 +111,7 @@ insert_executor(PyCodeObject *code, _Py_CODEUNIT *instr, int index, _PyExecutorO
instr->op.code = ENTER_EXECUTOR;
instr->op.arg = index;
}
#endif // Py_GIL_DISABLED

static _PyExecutorObject *
make_executor_from_uops(_PyThreadStateImpl *tstate, _PyUOpInstruction *buffer, int length, const _PyBloomFilter *dependencies);
Expand All @@ -128,7 +130,6 @@ _PyOptimizer_Optimize(
_PyInterpreterFrame *frame, PyThreadState *tstate)
{
_PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
int chain_depth = _tstate->jit_tracer_state->initial_state.chain_depth;
PyInterpreterState *interp = _PyInterpreterState_GET();
if (!interp->jit) {
// gh-140936: It is possible that interp->jit will become false during
Expand All @@ -152,6 +153,7 @@ _PyOptimizer_Optimize(
// make progress in order to avoid infinite loops or excessively-long
// side-exit chains. We can only insert the executor into the bytecode if
// this is true, since a deopt won't infinitely re-enter the executor:
int chain_depth = _tstate->jit_tracer_state->initial_state.chain_depth;
chain_depth %= MAX_CHAIN_DEPTH;
bool progress_needed = chain_depth == 0;
PyCodeObject *code = (PyCodeObject *)_tstate->jit_tracer_state->initial_state.code;
Expand Down
12 changes: 8 additions & 4 deletions Python/optimizer_bytecodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,8 @@ dummy_func(void) {
}

op(_GUARD_IP__PUSH_FRAME, (ip/4 --)) {
stack_pointer = sym_set_stack_depth(this_instr->operand1, stack_pointer);
(void)ip;
stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer);
// TO DO
// Normal function calls to known functions
// do not need an IP guard.
Expand All @@ -1659,24 +1660,27 @@ dummy_func(void) {
}

op(_GUARD_IP_YIELD_VALUE, (ip/4 --)) {
(void)ip;
if (ctx->frame->caller) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
stack_pointer = sym_set_stack_depth(this_instr->operand1, stack_pointer);
stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer);
}

op(_GUARD_IP_RETURN_VALUE, (ip/4 --)) {
(void)ip;
if (ctx->frame->caller) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
stack_pointer = sym_set_stack_depth(this_instr->operand1, stack_pointer);
stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer);
}

op(_GUARD_IP_RETURN_GENERATOR, (ip/4 --)) {
(void)ip;
if (ctx->frame->caller) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
stack_pointer = sym_set_stack_depth(this_instr->operand1, stack_pointer);
stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer);
}


Expand Down
12 changes: 8 additions & 4 deletions Python/optimizer_cases.c.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading