From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 8 Sep 2016 18:16:07 +0000 (-0700)
Subject: Split lookdict_unicode_nodummy() assertion to debug
X-Git-Tag: v3.6.0b1~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dee6e252cc59c3143786f3e4cfaa1a6c335381b6;p=thirdparty%2FPython%2Fcpython.git

Split lookdict_unicode_nodummy() assertion to debug

Issue #27350.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 98515e9dabf2..cd258034df85 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -802,7 +802,8 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
         return DKIX_EMPTY;
     }
     ep = &ep0[ix];
-    assert(ep->me_key != NULL && PyUnicode_CheckExact(ep->me_key));
+    assert(ep->me_key != NULL);
+    assert(PyUnicode_CheckExact(ep->me_key));
     if (ep->me_key == key ||
         (ep->me_hash == hash && unicode_eq(ep->me_key, key))) {
         if (hashpos != NULL)