Skip to content

gh-123881: make compiler add the .generic_base base class without constructing AST nodes #123883

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
iritkatriel merged 15 commits into from
Sep 10, 2024
Merged

gh-123881: make compiler add the .generic_base base class without constructing AST nodes #123883

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
031c697
add action helper for ClassDef
iritkatriel Sep 9, 2024
6547576
add .generic_base to bases in AST so compiler doesn't need to do it
iritkatriel Sep 9, 2024
412fe99
update tests
iritkatriel Sep 9, 2024
781fc79
add news
iritkatriel Sep 9, 2024
8200b77
add whatsnew entry
iritkatriel Sep 9, 2024
d75532a
Revert "add whatsnew entry"
iritkatriel Sep 9, 2024
22228eb
Revert "add news"
iritkatriel Sep 9, 2024
4831765
Revert "update tests"
iritkatriel Sep 9, 2024
5218173
Revert "add .generic_base to bases in AST so compiler doesn't need to…
iritkatriel Sep 9, 2024
0e52c0f
Revert "add action helper for ClassDef"
iritkatriel Sep 9, 2024
341f8a5
keep it in the compiler
iritkatriel Sep 9, 2024
e92c432
handle stararg case
iritkatriel Sep 10, 2024
40046c1
Merge remote-tracking branch 'upstream/main' into generic
iritkatriel Sep 10, 2024
4611b92
the compiler struct no longer needs the arena
iritkatriel Sep 10, 2024
c6c3cff
Merge branch 'main' into generic
iritkatriel Sep 10, 2024
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
handle stararg case
  • Loading branch information
@iritkatriel
iritkatriel committed Sep 10, 2024
commit e92c432982803ed0cc6ca9bd45250b8d7440ad69
36 changes: 26 additions & 10 deletions Python/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3173,19 +3173,18 @@ codegen_boolop(compiler *c, expr_ty e)
}

static int
starunpack_helper(compiler *c, location loc,
asdl_expr_seq *elts, int pushed,
int build, int add, int extend, int tuple)
starunpack_helper_impl(compiler *c, location loc,
asdl_expr_seq *elts, PyObject *injected_arg, int pushed,
int build, int add, int extend, int tuple)
{
Py_ssize_t n = asdl_seq_LEN(elts);
if (n > 2 && are_all_items_const(elts, 0, n)) {
if (!injected_arg && n > 2 && are_all_items_const(elts, 0, n)) {
PyObject *folded = PyTuple_New(n);
if (folded == NULL) {
return ERROR;
}
PyObject *val;
for (Py_ssize_t i = 0; i < n; i++) {
val = ((expr_ty)asdl_seq_GET(elts, i))->v.Constant.value;
PyObject *val = ((expr_ty)asdl_seq_GET(elts, i))->v.Constant.value;
PyTuple_SET_ITEM(folded, i, Py_NewRef(val));
}
if (tuple && !pushed) {
Expand All @@ -3207,7 +3206,7 @@ starunpack_helper(compiler *c, location loc,
return SUCCESS;
}

int big = n+pushed > STACK_USE_GUIDELINE;
int big = n + pushed + (injected_arg ? 1 : 0) > STACK_USE_GUIDELINE;
int seen_star = 0;
for (Py_ssize_t i = 0; i < n; i++) {
expr_ty elt = asdl_seq_GET(elts, i);
Expand All @@ -3221,6 +3220,10 @@ starunpack_helper(compiler *c, location loc,
expr_ty elt = asdl_seq_GET(elts, i);
VISIT(c, expr, elt);
}
if (injected_arg) {
RETURN_IF_ERROR(codegen_nameop(c, loc, injected_arg, Load));
n++;
}
if (tuple) {
ADDOP_I(c, loc, BUILD_TUPLE, n+pushed);
} else {
Expand Down Expand Up @@ -3251,12 +3254,25 @@ starunpack_helper(compiler *c, location loc,
}
}
assert(sequence_built);
if (injected_arg) {
RETURN_IF_ERROR(codegen_nameop(c, loc, injected_arg, Load));
ADDOP_I(c, loc, add, 1);
}
if (tuple) {
ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_LIST_TO_TUPLE);
}
return SUCCESS;
}

static int
starunpack_helper(compiler *c, location loc,
asdl_expr_seq *elts, int pushed,
int build, int add, int extend, int tuple)
{
return starunpack_helper_impl(c, loc, elts, NULL, pushed,
build, add, extend, tuple);
}

static int
unpack_helper(compiler *c, location loc, asdl_expr_seq *elts)
{
Expand Down Expand Up @@ -4014,12 +4030,12 @@ codegen_call_helper_impl(compiler *c, location loc,
ex_call:

/* Do positional arguments. */
if (n ==0 && nelts == 1 && ((expr_ty)asdl_seq_GET(args, 0))->kind == Starred_kind) {
if (n == 0 && nelts == 1 && ((expr_ty)asdl_seq_GET(args, 0))->kind == Starred_kind) {
VISIT(c, expr, ((expr_ty)asdl_seq_GET(args, 0))->v.Starred.value);
}
else {
RETURN_IF_ERROR(starunpack_helper(c, loc, args, n, BUILD_LIST,
LIST_APPEND, LIST_EXTEND, 1));
RETURN_IF_ERROR(starunpack_helper_impl(c, loc, args, injected_arg, n,
BUILD_LIST, LIST_APPEND, LIST_EXTEND, 1));
}
/* Then keyword arguments */
if (nkwelts) {
Expand Down