mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-42064: Offset arguments for PyObject_Vectorcall in the _sqlite module (GH-27931)

Browse source 
This allows e.g. methods to be called efficiently by providing
space for a "self" argument; see PY_VECTORCALL_ARGUMENTS_OFFSET docs.
This commit is contained in:
Petr Viktorin 2021-08-31 14:34:44 +02:00 • committed by GitHub
parent 001ef4600f
commit 01dea5f12b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/_sqlite/connection.c
View file

@ -59,19 +59,21 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self);
static PyObject * static PyObject *
new_statement_cache(pysqlite_Connection *self, int maxsize) new_statement_cache(pysqlite_Connection *self, int maxsize)
{ {
PyObject *args[] = { PyLong_FromLong(maxsize), }; PyObject *args[] = { NULL, PyLong_FromLong(maxsize), };
if (args[0] == NULL) { if (args[1] == NULL) {
return NULL; return NULL;
} }
PyObject *lru_cache = self->state->lru_cache; PyObject *lru_cache = self->state->lru_cache;
PyObject *inner = PyObject_Vectorcall(lru_cache, args, 1, NULL); size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
Py_DECREF(args[0]); PyObject *inner = PyObject_Vectorcall(lru_cache, args + 1, nargsf, NULL);
Py_DECREF(args[1]);
if (inner == NULL) { if (inner == NULL) {
return NULL; return NULL;
} }
args[0] = (PyObject *)self; // Borrowed ref. args[1] = (PyObject *)self; // Borrowed ref.
PyObject *res = PyObject_Vectorcall(inner, args, 1, NULL); nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
PyObject *res = PyObject_Vectorcall(inner, args + 1, nargsf, NULL);
Py_DECREF(inner); Py_DECREF(inner);
return res; return res;
} }
@ -1474,8 +1476,9 @@ pysqlite_collation_callback(
callback_context *ctx = (callback_context *)context; callback_context *ctx = (callback_context *)context;
assert(ctx != NULL); assert(ctx != NULL);
PyObject *args[] = { string1, string2 }; // Borrowed refs. PyObject *args[] = { NULL, string1, string2 }; // Borrowed refs.
retval = PyObject_Vectorcall(ctx->callable, args, 2, NULL); size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET;
retval = PyObject_Vectorcall(ctx->callable, args + 1, nargsf, NULL);
if (retval == NULL) { if (retval == NULL) {
/* execution failed */ /* execution failed */
goto finally; goto finally;

5
Modules/_sqlite/cursor.c
View file

@ -462,9 +462,10 @@ error:
static PyObject * static PyObject *
get_statement_from_cache(pysqlite_Cursor *self, PyObject *operation) get_statement_from_cache(pysqlite_Cursor *self, PyObject *operation)
{ {
PyObject *args[] = { operation, }; PyObject *args[] = { NULL, operation, }; // Borrowed ref.
PyObject *cache = self->connection->statement_cache; PyObject *cache = self->connection->statement_cache;
return PyObject_Vectorcall(cache, args, 1, NULL); size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
return PyObject_Vectorcall(cache, args + 1, nargsf, NULL);
} }
static PyObject * static PyObject *