fixed various asserts

Marco Sulla · Marco Sulla · commit 6866de543563 · 2021-11-20T22:38:25.000+01:00
diff --git a/frozendict/src/3_10/frozendictobject.c b/frozendict/src/3_10/frozendictobject.c
@@ -885,8 +885,6 @@ static int frozendict_insert(PyDictObject *mp,
     if (empty) {
         /* Insert into new slot. */
         
-        assert(old_value == NULL);
-
         if (mp->ma_keys->dk_usable <= 0) {
             /* Need to resize. */
             if (frozendict_resize(mp, GROWTH_RATE(mp))) {
@@ -912,7 +910,6 @@ static int frozendict_insert(PyDictObject *mp,
         assert(keys->dk_usable >= 0);
     }
     else {
-        assert(old_value != NULL);
         DK_ENTRIES(mp->ma_keys)[ix].me_value = value;
         Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
         Py_DECREF(key);
@@ -1130,6 +1127,8 @@ frozendict_fromkeys_impl(PyObject *type, PyObject *iterable, PyObject *value)
         }
     }
     
+    ASSERT_CONSISTENT(mp);
+    
     if ((PyTypeObject*) type == &PyFrozenDict_Type || (PyTypeObject*) type == &PyCoold_Type) {
         return d;
     }
@@ -2378,8 +2377,6 @@ static PyObject* _frozendict_new(
     
     mp->ma_version_tag = DICT_NEXT_VERSION();
     
-    ASSERT_CONSISTENT(mp);
-
     return self;
 }
 
diff --git a/frozendict/src/3_6/frozendictobject.c b/frozendict/src/3_6/frozendictobject.c
@@ -884,8 +884,6 @@ static int frozendict_insert(PyDictObject *mp,
     if (empty) {
         /* Insert into new slot. */
         
-        assert(old_value == NULL);
-
         if (mp->ma_keys->dk_usable <= 0) {
             /* Need to resize. */
             if (frozendict_resize(mp, GROWTH_RATE(mp))) {
@@ -911,7 +909,6 @@ static int frozendict_insert(PyDictObject *mp,
         assert(keys->dk_usable >= 0);
     }
     else {
-        assert(old_value != NULL);
         DK_ENTRIES(mp->ma_keys)[ix].me_value = value;
         Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
         Py_DECREF(key);
diff --git a/frozendict/src/3_7/frozendictobject.c b/frozendict/src/3_7/frozendictobject.c
@@ -893,8 +893,6 @@ static int frozendict_insert(PyDictObject *mp,
     if (empty) {
         /* Insert into new slot. */
         
-        assert(old_value == NULL);
-
         if (mp->ma_keys->dk_usable <= 0) {
             /* Need to resize. */
             if (frozendict_resize(mp, GROWTH_RATE(mp))) {
@@ -920,7 +918,6 @@ static int frozendict_insert(PyDictObject *mp,
         assert(keys->dk_usable >= 0);
     }
     else {
-        assert(old_value != NULL);
         DK_ENTRIES(mp->ma_keys)[ix].me_value = value;
         Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
         Py_DECREF(key);
@@ -1138,6 +1135,8 @@ frozendict_fromkeys_impl(PyObject *type, PyObject *iterable, PyObject *value)
         }
     }
     
+    ASSERT_CONSISTENT(mp);
+    
     if ((PyTypeObject*) type == &PyFrozenDict_Type || (PyTypeObject*) type == &PyCoold_Type) {
         return d;
     }
@@ -2277,8 +2276,6 @@ static PyObject* _frozendict_new(
     
     mp->ma_version_tag = DICT_NEXT_VERSION();
     
-    ASSERT_CONSISTENT(mp);
-
     return self;
 }
 
diff --git a/frozendict/src/3_8/frozendictobject.c b/frozendict/src/3_8/frozendictobject.c
@@ -897,8 +897,6 @@ static int frozendict_insert(PyDictObject *mp,
     if (empty) {
         /* Insert into new slot. */
         
-        assert(old_value == NULL);
-
         if (mp->ma_keys->dk_usable <= 0) {
             /* Need to resize. */
             if (frozendict_resize(mp, GROWTH_RATE(mp))) {
@@ -924,7 +922,6 @@ static int frozendict_insert(PyDictObject *mp,
         assert(keys->dk_usable >= 0);
     }
     else {
-        assert(old_value != NULL);
         DK_ENTRIES(mp->ma_keys)[ix].me_value = value;
         Py_DECREF(old_value); /* which **CAN** re-enter (see issue #22653) */
         Py_DECREF(key);
@@ -1142,6 +1139,8 @@ frozendict_fromkeys_impl(PyObject *type, PyObject *iterable, PyObject *value)
         }
     }
     
+    ASSERT_CONSISTENT(mp);
+    
     if ((PyTypeObject*) type == &PyFrozenDict_Type || (PyTypeObject*) type == &PyCoold_Type) {
         return d;
     }
@@ -2388,8 +2387,6 @@ static PyObject* _frozendict_new(
     
     mp->ma_version_tag = DICT_NEXT_VERSION();
     
-    ASSERT_CONSISTENT(mp);
-
     return self;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -885,8 +885,6 @@ static int frozendict_insert(PyDictObject *mp,`
`885`	`885`	`if (empty) {`
`886`	`886`	`/* Insert into new slot. */`
`887`	`887`
`888`		`- assert(old_value == NULL);`
`889`		`-`
`890`	`888`	`if (mp->ma_keys->dk_usable <= 0) {`
`891`	`889`	`/* Need to resize. */`
`892`	`890`	`if (frozendict_resize(mp, GROWTH_RATE(mp))) {`
`@@ -912,7 +910,6 @@ static int frozendict_insert(PyDictObject *mp,`
`912`	`910`	`assert(keys->dk_usable >= 0);`
`913`	`911`	`}`
`914`	`912`	`else {`
`915`		`- assert(old_value != NULL);`
`916`	`913`	`DK_ENTRIES(mp->ma_keys)[ix].me_value = value;`
`917`	`914`	`Py_DECREF(old_value); /* which CAN re-enter (see issue #22653) */`
`918`	`915`	`Py_DECREF(key);`
`@@ -1130,6 +1127,8 @@ frozendict_fromkeys_impl(PyObject type, PyObject iterable, PyObject *value)`
`1130`	`1127`	`}`
`1131`	`1128`	`}`
`1132`	`1129`
	`1130`	`+ ASSERT_CONSISTENT(mp);`
	`1131`	`+`
`1133`	`1132`	`if ((PyTypeObject) type == &PyFrozenDict_Type \|\| (PyTypeObject) type == &PyCoold_Type) {`
`1134`	`1133`	`return d;`
`1135`	`1134`	`}`
`@@ -2378,8 +2377,6 @@ static PyObject* _frozendict_new(`
`2378`	`2377`
`2379`	`2378`	`mp->ma_version_tag = DICT_NEXT_VERSION();`
`2380`	`2379`
`2381`		`- ASSERT_CONSISTENT(mp);`
`2382`		`-`
`2383`	`2380`	`return self;`
`2384`	`2381`	`}`
`2385`	`2382`
Original file line number	Diff line number	Diff line change
`@@ -893,8 +893,6 @@ static int frozendict_insert(PyDictObject *mp,`
`893`	`893`	`if (empty) {`
`894`	`894`	`/* Insert into new slot. */`
`895`	`895`
`896`		`- assert(old_value == NULL);`
`897`		`-`
`898`	`896`	`if (mp->ma_keys->dk_usable <= 0) {`
`899`	`897`	`/* Need to resize. */`
`900`	`898`	`if (frozendict_resize(mp, GROWTH_RATE(mp))) {`
`@@ -920,7 +918,6 @@ static int frozendict_insert(PyDictObject *mp,`
`920`	`918`	`assert(keys->dk_usable >= 0);`
`921`	`919`	`}`
`922`	`920`	`else {`
`923`		`- assert(old_value != NULL);`
`924`	`921`	`DK_ENTRIES(mp->ma_keys)[ix].me_value = value;`
`925`	`922`	`Py_DECREF(old_value); /* which CAN re-enter (see issue #22653) */`
`926`	`923`	`Py_DECREF(key);`
`@@ -1138,6 +1135,8 @@ frozendict_fromkeys_impl(PyObject type, PyObject iterable, PyObject *value)`
`1138`	`1135`	`}`
`1139`	`1136`	`}`
`1140`	`1137`
	`1138`	`+ ASSERT_CONSISTENT(mp);`
	`1139`	`+`
`1141`	`1140`	`if ((PyTypeObject) type == &PyFrozenDict_Type \|\| (PyTypeObject) type == &PyCoold_Type) {`
`1142`	`1141`	`return d;`
`1143`	`1142`	`}`
`@@ -2277,8 +2276,6 @@ static PyObject* _frozendict_new(`
`2277`	`2276`
`2278`	`2277`	`mp->ma_version_tag = DICT_NEXT_VERSION();`
`2279`	`2278`
`2280`		`- ASSERT_CONSISTENT(mp);`
`2281`		`-`
`2282`	`2279`	`return self;`
`2283`	`2280`	`}`
`2284`	`2281`
Original file line number	Diff line number	Diff line change
`@@ -897,8 +897,6 @@ static int frozendict_insert(PyDictObject *mp,`
`897`	`897`	`if (empty) {`
`898`	`898`	`/* Insert into new slot. */`
`899`	`899`
`900`		`- assert(old_value == NULL);`
`901`		`-`
`902`	`900`	`if (mp->ma_keys->dk_usable <= 0) {`
`903`	`901`	`/* Need to resize. */`
`904`	`902`	`if (frozendict_resize(mp, GROWTH_RATE(mp))) {`
`@@ -924,7 +922,6 @@ static int frozendict_insert(PyDictObject *mp,`
`924`	`922`	`assert(keys->dk_usable >= 0);`
`925`	`923`	`}`
`926`	`924`	`else {`
`927`		`- assert(old_value != NULL);`
`928`	`925`	`DK_ENTRIES(mp->ma_keys)[ix].me_value = value;`
`929`	`926`	`Py_DECREF(old_value); /* which CAN re-enter (see issue #22653) */`
`930`	`927`	`Py_DECREF(key);`
`@@ -1142,6 +1139,8 @@ frozendict_fromkeys_impl(PyObject type, PyObject iterable, PyObject *value)`
`1142`	`1139`	`}`
`1143`	`1140`	`}`
`1144`	`1141`
	`1142`	`+ ASSERT_CONSISTENT(mp);`
	`1143`	`+`
`1145`	`1144`	`if ((PyTypeObject) type == &PyFrozenDict_Type \|\| (PyTypeObject) type == &PyCoold_Type) {`
`1146`	`1145`	`return d;`
`1147`	`1146`	`}`
`@@ -2388,8 +2387,6 @@ static PyObject* _frozendict_new(`
`2388`	`2387`
`2389`	`2388`	`mp->ma_version_tag = DICT_NEXT_VERSION();`
`2390`	`2389`
`2391`		`- ASSERT_CONSISTENT(mp);`
`2392`		`-`
`2393`	`2390`	`return self;`
`2394`	`2391`	`}`
`2395`	`2392`