Fix set_table_resize() call in PyFrozenSetWriter_Create()

Author: vstinner

Lib/test/test_capi/test_set.py

@@ -310,9 +310,10 @@ def check_table_size(size, table_size):
             self.assertEqual(writer.get_table_size(), table_size)
 
         check_table_size(0, PySet_MINSIZE)
-        check_table_size(PySet_MINSIZE - 1, PySet_MINSIZE)
-        check_table_size(PySet_MINSIZE, PySet_MINSIZE * 2)
-        check_table_size(2 ** 15 - 1, 2 ** 15)
+        check_table_size(PySet_MINSIZE // 2, PySet_MINSIZE)
+        check_table_size(PySet_MINSIZE - 1, PySet_MINSIZE * 2)
+        check_table_size(PySet_MINSIZE, PySet_MINSIZE * 4)
+        check_table_size(2 ** 15 - 1, 2 ** 16)
 
     def create_items(self, nitem):
         # Use mortal (and unique) objects to be able to detect reference leaks

Objects/setobject.c

@@ -3251,13 +3251,14 @@ PyFrozenSetWriter_Create(Py_ssize_t size)
         return NULL;
     }
 
-    PyObject *frozenset = make_new_set_untracked(&PyFrozenSet_Type, NULL);
-    if (frozenset == NULL) {
+    PyObject *frozenset_obj = make_new_set_untracked(&PyFrozenSet_Type, NULL);
+    if (frozenset_obj == NULL) {
         return NULL;
     }
+    PySetObject *frozenset = _PySet_CAST(frozenset_obj);
 
-    if (size > 0) {
-        if (set_table_resize(_PySet_CAST(frozenset), size) != 0) {
+    if (size > 0 && size * 5 >= frozenset->mask * 3) {
+        if (set_table_resize(frozenset, size * 2) != 0) {
             Py_DECREF(frozenset);
             return NULL;
         }