@@ -4293,6 +4293,10 @@ Tools/Demos
 Extension Modules
 -----------------
 
+- Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in
+  non-pydebug builds. Several extension modules now compile cleanly when
+  assert()s are enabled in standard builds (-DDEBUG flag).
+
 - Issue #13840: The error message produced by ctypes.create_string_buffer
   when given a Unicode string has been fixed.
 
 
@@ -246,7 +246,9 @@ ascii_escape_unicode(PyObject *pystr)
         }
     }
     output[chars++] = '"';
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(rval, 1));
+#endif
     return rval;
 }
 
 
@@ -399,7 +399,9 @@ MD5_hexdigest(MD5object *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
 
@@ -376,7 +376,9 @@ SHA1_hexdigest(SHA1object *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
 
@@ -466,7 +466,9 @@ SHA256_hexdigest(SHAobject *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
 
@@ -532,7 +532,9 @@ SHA512_hexdigest(SHAobject *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,9 @@ ascii_escape_unicode(PyObject *pystr)`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`	`output[chars++] = '"';`
	`249`	`+#ifdef Py_DEBUG`
`249`	`250`	`assert(_PyUnicode_CheckConsistency(rval, 1));`
	`251`	`+#endif`
`250`	`252`	`return rval;`
`251`	`253`	`}`
`252`	`254`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,9 @@ MD5_hexdigest(MD5object self, PyObject unused)`
`399`	`399`	`c = (digest[i] & 0xf);`
`400`	`400`	`hex_digest[j++] = Py_hexdigits[c];`
`401`	`401`	`}`
	`402`	`+#ifdef Py_DEBUG`
`402`	`403`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`404`	`+#endif`
`403`	`405`	`return retval;`
`404`	`406`	`}`
`405`	`407`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,9 @@ SHA1_hexdigest(SHA1object self, PyObject unused)`
`376`	`376`	`c = (digest[i] & 0xf);`
`377`	`377`	`hex_digest[j++] = Py_hexdigits[c];`
`378`	`378`	`}`
	`379`	`+#ifdef Py_DEBUG`
`379`	`380`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`381`	`+#endif`
`380`	`382`	`return retval;`
`381`	`383`	`}`
`382`	`384`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,9 @@ SHA256_hexdigest(SHAobject self, PyObject unused)`
`466`	`466`	`c = (digest[i] & 0xf);`
`467`	`467`	`hex_digest[j++] = Py_hexdigits[c];`
`468`	`468`	`}`
	`469`	`+#ifdef Py_DEBUG`
`469`	`470`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`471`	`+#endif`
`470`	`472`	`return retval;`
`471`	`473`	`}`
`472`	`474`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,9 @@ SHA512_hexdigest(SHAobject self, PyObject unused)`
`532`	`532`	`c = (digest[i] & 0xf);`
`533`	`533`	`hex_digest[j++] = Py_hexdigits[c];`
`534`	`534`	`}`
	`535`	`+#ifdef Py_DEBUG`
`535`	`536`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`537`	`+#endif`
`536`	`538`	`return retval;`
`537`	`539`	`}`
`538`	`540`