Skip to content

gh-90928: Statically Initialize the Keywords Tuple in Clinic-Generated Code #95860

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
ericsnowcurrently merged 20 commits into from
Aug 11, 2022
Merged

gh-90928: Statically Initialize the Keywords Tuple in Clinic-Generated Code #95860

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e03f6cd
Do not squash the _PyArg_Parser declarations into a single line.
ericsnowcurrently Feb 12, 2022
3737e79
Factor out declare_parser().
ericsnowcurrently Feb 14, 2022
f022fcc
Simplify.
ericsnowcurrently Feb 14, 2022
cfee830
Make it clear about when format is NULL.
ericsnowcurrently Feb 23, 2022
4b87250
Factor out scan_keywords().
ericsnowcurrently Feb 23, 2022
a52d83f
Factor out parse_format().
ericsnowcurrently Feb 23, 2022
33227de
Factor out new_kwtuple().
ericsnowcurrently Feb 23, 2022
698c35a
Add an explicit "initialized" field.
ericsnowcurrently Feb 23, 2022
7c7f497
Statically initialize PyArg_Parser.kwtuple.
ericsnowcurrently Feb 14, 2022
22b8a20
Explicitly import some internal headers.
ericsnowcurrently Feb 24, 2022
b9312d0
Do not statically init kwtuple for Py_BUILD_CORE_MODULE.
ericsnowcurrently Aug 10, 2022
d1287d0
fix hashing
kumaraditya303 Jun 1, 2022
4deab96
Drop all generated code (temporarily).
ericsnowcurrently Mar 3, 2022
92e78fe
Re-generate.
ericsnowcurrently Aug 10, 2022
13e4b89
Ignore positional-only args.
ericsnowcurrently Aug 10, 2022
5eafa67
Fix parser_init().
ericsnowcurrently Aug 10, 2022
c90f0a8
windows fix part 1
kumaraditya303 Jun 1, 2022
3b308c4
Update the clinic tests.
ericsnowcurrently Aug 10, 2022
2efabaa
Drop an extraneous edit.
ericsnowcurrently Aug 11, 2022
44a193b
Add a comment.
ericsnowcurrently Aug 11, 2022
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
Next Next commit
Fix parser_init().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Aug 10, 2022
commit 5eafa678b38aa2ede8e57968d0bb44755fa4e73c
28 changes: 18 additions & 10 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1976,12 +1976,7 @@ new_kwtuple(const char * const *keywords, int total, int pos)
static int
parser_init(struct _PyArg_Parser *parser)
{
const char * const *keywords;
const char *fname, *custommsg;
int len, pos, min, max, owned;
PyObject *kwtuple;

keywords = parser->keywords;
const char * const *keywords = parser->keywords;
assert(keywords != NULL);

if (parser->initialized) {
Expand All @@ -1994,14 +1989,27 @@ parser_init(struct _PyArg_Parser *parser)
parser->min == 0 &&
parser->max == 0);

int len, pos;
if (scan_keywords(keywords, &len, &pos) < 0) {
return 0;
}
if (parser->format && parse_format(parser->format, len, pos,
&fname, &custommsg, &min, &max) < 0) {
return 0;

const char *fname, *custommsg = NULL;
int min = 0, max = 0;
if (parser->format) {
assert(parser->fname == NULL);
if (parse_format(parser->format, len, pos,
&fname, &custommsg, &min, &max) < 0) {
return 0;
}
}
kwtuple = parser->kwtuple;
else {
assert(parser->fname != NULL);
fname = parser->fname;
}

int owned;
PyObject *kwtuple = parser->kwtuple;
if (kwtuple == NULL) {
kwtuple = new_kwtuple(keywords, len, pos);
if (kwtuple == NULL) {
Expand Down