Fix warnings on main (GH-145104)

diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index f20726a937ce385b8ba422f64286ac92aa1b6c09..27bdd19c4094710c63a6bbb2456e4f0c975bca65 100644 (file)
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -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;
         }

diff --git a/Python/optimizer.c b/Python/optimizer.c
index f075e28d71e0f8f834d1641420dee57d28240424..6a575c8573724a55c341c04cdb986d85dde19f96 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -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)
 {
@@ -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);
@@ -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
@@ -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;

diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 228bd51a28bb69a47588a1f5b00fee549e5219b0..4e4aec2f37e29bd208d9e68ba77d887b4c8fef19 100644 (file)
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -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.
@@ -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);
     }
 
 

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index a93e85329297cd44e6972057aa6f159045a05d04..286fe014b65f0e7cb06fbf4e3a90424ef6a614d0 100644 (file)
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -4159,34 +4159,38 @@
 
         case _GUARD_IP__PUSH_FRAME: {
             PyObject *ip = (PyObject *)this_instr->operand0;
-            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);
             break;
         }
 
         case _GUARD_IP_YIELD_VALUE: {
             PyObject *ip = (PyObject *)this_instr->operand0;
+            (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);
             break;
         }
 
         case _GUARD_IP_RETURN_VALUE: {
             PyObject *ip = (PyObject *)this_instr->operand0;
+            (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);
             break;
         }
 
         case _GUARD_IP_RETURN_GENERATOR: {
             PyObject *ip = (PyObject *)this_instr->operand0;
+            (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);
             break;
         }