Skip to content

bpo-42064: Offset arguments for PyObject_Vectorcall in the _sqlite module #27931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 3 commits into from
Aug 31, 2021
+14 −10
Merged

bpo-42064: Offset arguments for PyObject_Vectorcall in the _sqlite module #27931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dad0c57
Offset arguments for PyObject_Vectorcall in the _sqlite module
encukou Aug 24, 2021
2cbaf4d
Note about borrowed ref
encukou Aug 31, 2021
3a2e3fa
Avoid long lines
encukou Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Avoid long lines
  • Loading branch information
@encukou
encukou committed Aug 31, 2021
commit 3a2e3fac62d3b4e94809073721079b59eb642474
12 changes: 6 additions & 6 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ new_statement_cache(pysqlite_Connection *self, int maxsize)
return NULL;
}
PyObject *lru_cache = self->state->lru_cache;
PyObject *inner = PyObject_Vectorcall(
lru_cache, args + 1, 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
PyObject *inner = PyObject_Vectorcall(lru_cache, args + 1, nargsf, NULL);
Py_DECREF(args[1]);
if (inner == NULL) {
return NULL;
}

args[1] = (PyObject *)self; // Borrowed ref.
PyObject *res = PyObject_Vectorcall(
inner, args + 1, 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
PyObject *res = PyObject_Vectorcall(inner, args + 1, nargsf, NULL);
Py_DECREF(inner);
return res;
}
Expand Down Expand Up @@ -1485,8 +1485,8 @@ pysqlite_collation_callback(
callback_context *ctx = (callback_context *)context;
assert(ctx != NULL);
PyObject *args[] = { NULL, string1, string2 }; // Borrowed refs.
retval = PyObject_Vectorcall(
ctx->callable, args + 1, 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET;
retval = PyObject_Vectorcall(ctx->callable, args + 1, nargsf, NULL);
if (retval == NULL) {
/* execution failed */
goto finally;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,8 @@ get_statement_from_cache(pysqlite_Cursor *self, PyObject *operation)
{
PyObject *args[] = { NULL, operation, }; // Borrowed ref.
PyObject *cache = self->connection->statement_cache;
return PyObject_Vectorcall(
cache, args + 1, 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
return PyObject_Vectorcall(cache, args + 1, nargsf, NULL);
}

static PyObject *
Expand Down