bpo-40941: Fix fold_tuple_on_constants() compiler warnings (GH-22378)

vstinner · web-flow · commit 71f2ff4ccf4f · 2020-09-23T14:06:55.000+02:00
Add explicit casts to fix compiler warnings in
fold_tuple_on_constants().

The limit of constants per code is now INT_MAX, rather than UINT_MAX.
diff --git a/Python/compile.c b/Python/compile.c
@@ -6100,13 +6100,11 @@ fold_tuple_on_constants(struct instr *inst,
         PyTuple_SET_ITEM(newconst, i, constant);
     }
     Py_ssize_t index = PyList_GET_SIZE(consts);
-#if SIZEOF_SIZE_T > SIZEOF_INT
-    if ((size_t)index >= UINT_MAX - 1) {
+    if ((size_t)index >= (size_t)INT_MAX - 1) {
         Py_DECREF(newconst);
         PyErr_SetString(PyExc_OverflowError, "too many constants");
         return -1;
     }
-#endif
     if (PyList_Append(consts, newconst)) {
         Py_DECREF(newconst);
         return -1;
@@ -6116,7 +6114,7 @@ fold_tuple_on_constants(struct instr *inst,
         inst[i].i_opcode = NOP;
     }
     inst[n].i_opcode = LOAD_CONST;
-    inst[n].i_oparg = index;
+    inst[n].i_oparg = (int)index;
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6100,13 +6100,11 @@ fold_tuple_on_constants(struct instr *inst,`
`6100`	`6100`	`PyTuple_SET_ITEM(newconst, i, constant);`
`6101`	`6101`	`}`
`6102`	`6102`	`Py_ssize_t index = PyList_GET_SIZE(consts);`
`6103`		`-#if SIZEOF_SIZE_T > SIZEOF_INT`
`6104`		`- if ((size_t)index >= UINT_MAX - 1) {`
	`6103`	`+ if ((size_t)index >= (size_t)INT_MAX - 1) {`
`6105`	`6104`	`Py_DECREF(newconst);`
`6106`	`6105`	`PyErr_SetString(PyExc_OverflowError, "too many constants");`
`6107`	`6106`	`return -1;`
`6108`	`6107`	`}`
`6109`		`-#endif`
`6110`	`6108`	`if (PyList_Append(consts, newconst)) {`
`6111`	`6109`	`Py_DECREF(newconst);`
`6112`	`6110`	`return -1;`
`@@ -6116,7 +6114,7 @@ fold_tuple_on_constants(struct instr *inst,`
`6116`	`6114`	`inst[i].i_opcode = NOP;`
`6117`	`6115`	`}`
`6118`	`6116`	`inst[n].i_opcode = LOAD_CONST;`
`6119`		`- inst[n].i_oparg = index;`
	`6117`	`+ inst[n].i_oparg = (int)index;`
`6120`	`6118`	`return 0;`
`6121`	`6119`	`}`
`6122`	`6120`