From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 13 Sep 2016 07:38:29 +0000 (+0200)
Subject: Issue #28040: Cleanup find_empty_slot()
X-Git-Tag: v3.6.0b2~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9926480b6aaab60d2c5f710e7fc60061c52f6f08;p=thirdparty%2FPython%2Fcpython.git

Issue #28040: Cleanup find_empty_slot()

find_empty_slot() only supports combined dict
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 8b88ec6eef2f..bb5962a1a5e2 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -987,7 +987,7 @@ _PyDict_MaybeUntrack(PyObject *op)
    when it is known that the key is not present in the dict.
 
    The dict must be combined. */
-static Py_ssize_t
+static void
 find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash,
                 PyObject ***value_addr, Py_ssize_t *hashpos)
 {
@@ -1011,11 +1011,7 @@ find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash,
     ep = &ep0[mp->ma_keys->dk_nentries];
     *hashpos = i & mask;
     assert(ep->me_value == NULL);
-    if (mp->ma_values)
-        *value_addr = &mp->ma_values[ix];
-    else
-        *value_addr = &ep->me_value;
-    return ix;
+    *value_addr = &ep->me_value;
 }
 
 static int