Skip to content

gh-104799: Default missing lists in AST to the empty list - #104834

Merged
JelleZijlstra merged 7 commits into
python:mainfrom
JelleZijlstra:defaultempty
Jun 2, 2023
Merged

gh-104799: Default missing lists in AST to the empty list#104834
JelleZijlstra merged 7 commits into
python:mainfrom
JelleZijlstra:defaultempty

Conversation

@JelleZijlstra

@JelleZijlstraJelleZijlstra commented May 24, 2023

Copy link
Copy Markdown
Member

Motivated by #104799: avoid breaking backward compatibility with the manual creation of ast.FunctionDef nodes. Now, if a list-type field is missing, we simply default to the empty list.

This affects all AST nodes though, not just the new ones.


📚 Documentation preview 📚: https://cpython-previews--104834.org.readthedocs.build/

@JelleZijlstra

Copy link
Copy Markdown
MemberAuthor

(This PR is on top of the changes from #104828.)

@JelleZijlstra

Copy link
Copy Markdown
MemberAuthor

Ideally I'd like this to go into 3.12 to fix the BC issues in #104799, but maybe it's too late.

@markshannon

Copy link
Copy Markdown
Member

So I understand correctly, this changes the representation of a missing list from NULL to PyList_New(0). Correct?

I am a little concerned (just a little) about the performance implications.
Which nodes will this affect in practice?

@JelleZijlstra

Copy link
Copy Markdown
MemberAuthor

So I understand correctly, this changes the representation of a missing list from NULL to PyList_New(0). Correct?

No, it changes from raising a TypeError to PyList_New(0). This is easier to see in the generated code than in the code generator:

@@ -9306,10 +9404,12 @@ obj2ast_expr(struct ast_state *state, PyObject* obj, expr_ty* out, PyArena*
return 1;
}
if (tmp == NULL) {
- PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from DictComp");- return 1;+ tmp = PyList_New(0);+ if (tmp == NULL) {+ return 1;+ }
}
- else {+ {
int res;
Py_ssize_t len;
Py_ssize_t i;

So this shouldn't affect performance for code that was already working.

@JelleZijlstra
JelleZijlstra merged commit 77d2579 into python:mainJun 2, 2023
@JelleZijlstra
JelleZijlstra deleted the defaultempty branch June 2, 2023 01:39
@JelleZijlstraJelleZijlstra added the needs backport to 3.12 only security fixes label Jun 2, 2023
@miss-islington

Copy link
Copy Markdown
Contributor

Thanks @JelleZijlstra for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 2, 2023
…onGH-104834)
(cherry picked from commit 77d2579)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@bedevere-bot

Copy link
Copy Markdown

GH-105213 is a backport of this pull request to the 3.12 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.12 only security fixes label Jun 2, 2023
JelleZijlstra added a commit that referenced this pull request Jun 2, 2023
…104834) (#105213)
(cherry picked from commit 77d2579)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@JelleZijlstra
JelleZijlstra restored the defaultempty branch September 10, 2024 23:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@JelleZijlstra@markshannon@miss-islington@bedevere-bot@AlexWaygood