[Python-checkins] bpo-45045: Optimize mapping patterns of structural pattern matching (GH-28043)
corona10
webhook-mailer at python.org
Mon Aug 30 06:02:43 EDT 2021
https://github.com/python/cpython/commit/e6497fe698f6e87344501a68ffdea106eafcb257
commit: e6497fe698f6e87344501a68ffdea106eafcb257
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2021-08-30T19:02:32+09:00
summary:
bpo-45045: Optimize mapping patterns of structural pattern matching (GH-28043)
files:
M Lib/test/test_patma.py
M Python/ceval.c
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
index aa18e29e22548f..57d3b1ec701ca4 100644
--- a/Lib/test/test_patma.py
+++ b/Lib/test/test_patma.py
@@ -2641,6 +2641,19 @@ def f(x):
self.assertEqual(f((False, range(-1, -11, -1), True)), alts[3])
self.assertEqual(f((False, range(10, 20), True)), alts[4])
+ def test_patma_248(self):
+ class C(dict):
+ @staticmethod
+ def get(key, default=None):
+ return 'bar'
+
+ x = C({'foo': 'bar'})
+ match x:
+ case {'foo': bar}:
+ y = bar
+
+ self.assertEqual(y, 'bar')
+
class TestSyntaxErrors(unittest.TestCase):
diff --git a/Python/ceval.c b/Python/ceval.c
index 8aaa83b1b74bf4..bf95d50b629582 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -841,12 +841,18 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
PyObject *seen = NULL;
PyObject *dummy = NULL;
PyObject *values = NULL;
+ PyObject *get_name = NULL;
+ PyObject *get = NULL;
// We use the two argument form of map.get(key, default) for two reasons:
// - Atomically check for a key and get its value without error handling.
// - Don't cause key creation or resizing in dict subclasses like
// collections.defaultdict that define __missing__ (or similar).
_Py_IDENTIFIER(get);
- PyObject *get = _PyObject_GetAttrId(map, &PyId_get);
+ get_name = _PyUnicode_FromId(&PyId_get); // borrowed
+ if (get_name == NULL) {
+ return NULL;
+ }
+ int meth_found = _PyObject_GetMethod(map, get_name, &get);
if (get == NULL) {
goto fail;
}
@@ -859,7 +865,7 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
if (dummy == NULL) {
goto fail;
}
- values = PyList_New(0);
+ values = PyTuple_New(nkeys);
if (values == NULL) {
goto fail;
}
@@ -873,7 +879,14 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
}
goto fail;
}
- PyObject *value = PyObject_CallFunctionObjArgs(get, key, dummy, NULL);
+ PyObject *args[] = { map, key, dummy };
+ PyObject *value = NULL;
+ if (meth_found) {
+ value = PyObject_Vectorcall(get, args, 3, NULL);
+ }
+ else {
+ value = PyObject_Vectorcall(get, &args[1], 2, NULL);
+ }
if (value == NULL) {
goto fail;
}
@@ -886,10 +899,8 @@ match_keys(PyThreadState *tstate, PyObject *map, PyObject *keys)
values = Py_None;
goto done;
}
- PyList_Append(values, value);
- Py_DECREF(value);
+ PyTuple_SET_ITEM(values, i, value);
}
- Py_SETREF(values, PyList_AsTuple(values));
// Success:
done:
Py_DECREF(get);
More information about the Python-checkins
mailing list