gh-111133: Remove unnecessary PyFrozenSet_Check() calls in const folding (GH-111137)

Eclips4 · web-flow · commit 7162c3a1e870 · 2023-10-20T23:37:38.000+03:00
frozenset does not support multiplication.
diff --git a/Python/ast_opt.c b/Python/ast_opt.c
@@ -142,15 +142,6 @@ check_complexity(PyObject *obj, Py_ssize_t limit)
         }
         return limit;
     }
-    else if (PyFrozenSet_Check(obj)) {
-        Py_ssize_t i = 0;
-        PyObject *item;
-        Py_hash_t hash;
-        limit -= PySet_GET_SIZE(obj);
-        while (limit >= 0 && _PySet_NextEntry(obj, &i, &item, &hash)) {
-            limit = check_complexity(item, limit);
-        }
-    }
     return limit;
 }
 
@@ -174,9 +165,8 @@ safe_multiply(PyObject *v, PyObject *w)
             return NULL;
         }
     }
-    else if (PyLong_Check(v) && (PyTuple_Check(w) || PyFrozenSet_Check(w))) {
-        Py_ssize_t size = PyTuple_Check(w) ? PyTuple_GET_SIZE(w) :
-                                             PySet_GET_SIZE(w);
+    else if (PyLong_Check(v) && PyTuple_Check(w)) {
+        Py_ssize_t size = PyTuple_GET_SIZE(w);
         if (size) {
             long n = PyLong_AsLong(v);
             if (n < 0 || n > MAX_COLLECTION_SIZE / size) {
@@ -198,8 +188,7 @@ safe_multiply(PyObject *v, PyObject *w)
         }
     }
     else if (PyLong_Check(w) &&
-             (PyTuple_Check(v) || PyFrozenSet_Check(v) ||
-              PyUnicode_Check(v) || PyBytes_Check(v)))
+             (PyTuple_Check(v) || PyUnicode_Check(v) || PyBytes_Check(v)))
     {
         return safe_multiply(w, v);
     }

Original file line number	Diff line number	Diff line change
`@@ -142,15 +142,6 @@ check_complexity(PyObject *obj, Py_ssize_t limit)`
`142`	`142`	`}`
`143`	`143`	`return limit;`
`144`	`144`	`}`
`145`		`- else if (PyFrozenSet_Check(obj)) {`
`146`		`- Py_ssize_t i = 0;`
`147`		`- PyObject *item;`
`148`		`- Py_hash_t hash;`
`149`		`- limit -= PySet_GET_SIZE(obj);`
`150`		`- while (limit >= 0 && _PySet_NextEntry(obj, &i, &item, &hash)) {`
`151`		`- limit = check_complexity(item, limit);`
`152`		`- }`
`153`		`- }`
`154`	`145`	`return limit;`
`155`	`146`	`}`
`156`	`147`
`@@ -174,9 +165,8 @@ safe_multiply(PyObject v, PyObject w)`
`174`	`165`	`return NULL;`
`175`	`166`	`}`
`176`	`167`	`}`
`177`		`- else if (PyLong_Check(v) && (PyTuple_Check(w) \|\| PyFrozenSet_Check(w))) {`
`178`		`- Py_ssize_t size = PyTuple_Check(w) ? PyTuple_GET_SIZE(w) :`
`179`		`- PySet_GET_SIZE(w);`
	`168`	`+ else if (PyLong_Check(v) && PyTuple_Check(w)) {`
	`169`	`+ Py_ssize_t size = PyTuple_GET_SIZE(w);`
`180`	`170`	`if (size) {`
`181`	`171`	`long n = PyLong_AsLong(v);`
`182`	`172`	`if (n < 0 \|\| n > MAX_COLLECTION_SIZE / size) {`
`@@ -198,8 +188,7 @@ safe_multiply(PyObject v, PyObject w)`
`198`	`188`	`}`
`199`	`189`	`}`
`200`	`190`	`else if (PyLong_Check(w) &&`
`201`		`- (PyTuple_Check(v) \|\| PyFrozenSet_Check(v) \|\|`
`202`		`- PyUnicode_Check(v) \|\| PyBytes_Check(v)))`
	`191`	`+ (PyTuple_Check(v) \|\| PyUnicode_Check(v) \|\| PyBytes_Check(v)))`
`203`	`192`	`{`
`204`	`193`	`return safe_multiply(w, v);`
`205`	`194`	`}`