Fix unused variable and signed/unsigned warnings (GH-15537) (GH-15551)

miss-islington · rhettinger · rhettinger · commit d5ba8bbdae9a · 2019-08-27T10:13:52.000-07:00
(cherry picked from commit 0138c4c) Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com>
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -456,10 +456,14 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
     }
     else {
         PyCompactUnicodeObject *compact = (PyCompactUnicodeObject *)op;
+#ifndef NDEBUG
         void *data;
+#endif
 
         if (ascii->state.compact == 1) {
+#ifndef NDEBUG
             data = compact + 1;
+#endif
             _PyObject_ASSERT(op, kind == PyUnicode_1BYTE_KIND
                                  || kind == PyUnicode_2BYTE_KIND
                                  || kind == PyUnicode_4BYTE_KIND);
@@ -468,9 +472,11 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
             _PyObject_ASSERT(op, compact->utf8 != data);
         }
         else {
+#ifndef NDEBUG
             PyUnicodeObject *unicode = (PyUnicodeObject *)op;
 
             data = unicode->data.any;
+#endif
             if (kind == PyUnicode_WCHAR_KIND) {
                 _PyObject_ASSERT(op, ascii->length == 0);
                 _PyObject_ASSERT(op, ascii->hash == -1);
diff --git a/Python/peephole.c b/Python/peephole.c
@@ -255,8 +255,8 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
        than +255 (encoded as multiple bytes), just to keep the peephole optimizer
        simple. The optimizer leaves line number deltas unchanged. */
 
-    for (j = 0; j < tabsiz; j += 2) {
-        if (lnotab[j] == 255) {
+    for (i = 0; i < tabsiz; i += 2) {
+        if (lnotab[i] == 255) {
             goto exitUnchanged;
         }
     }
diff --git a/Python/pystrhex.c b/Python/pystrhex.c
@@ -57,7 +57,7 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
     }
     resultlen += arglen * 2;
 
-    if (abs_bytes_per_sep >= arglen) {
+    if ((size_t)abs_bytes_per_sep >= (size_t)arglen) {
         bytes_per_sep_group = 0;
         abs_bytes_per_sep = 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,8 @@ PyCode_Optimize(PyObject code, PyObject consts, PyObject *names,`
`255`	`255`	`than +255 (encoded as multiple bytes), just to keep the peephole optimizer`
`256`	`256`	`simple. The optimizer leaves line number deltas unchanged. */`
`257`	`257`
`258`		`- for (j = 0; j < tabsiz; j += 2) {`
`259`		`- if (lnotab[j] == 255) {`
	`258`	`+ for (i = 0; i < tabsiz; i += 2) {`
	`259`	`+ if (lnotab[i] == 255) {`
`260`	`260`	`goto exitUnchanged;`
`261`	`261`	`}`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static PyObject _Py_strhex_impl(const char argbuf, const Py_ssize_t arglen,`
`57`	`57`	`}`
`58`	`58`	`resultlen += arglen * 2;`
`59`	`59`
`60`		`- if (abs_bytes_per_sep >= arglen) {`
	`60`	`+ if ((size_t)abs_bytes_per_sep >= (size_t)arglen) {`
`61`	`61`	`bytes_per_sep_group = 0;`
`62`	`62`	`abs_bytes_per_sep = 0;`
`63`	`63`	`}`