Skip to content

gh-93691: Compiler's code-gen passes location around instead of holding it on the global compiler state #98001

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 13 commits into from
Oct 17, 2022
Merged

gh-93691: Compiler's code-gen passes location around instead of holding it on the global compiler state #98001

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ecfa12e
pass location into the various ADDOPs
iritkatriel Sep 29, 2022
082625c
Pass locations around instead of using the one on the compiler state.…
iritkatriel Sep 30, 2022
c50ff36
find last loc in finally body
iritkatriel Oct 6, 2022
091266f
remove scaffold
iritkatriel Oct 6, 2022
8fd667d
remove u_loc from compiler_unit
iritkatriel Oct 6, 2022
c7764ce
Merge remote-tracking branch 'upstream/main' into linenos
iritkatriel Oct 6, 2022
498e98b
Merge remote-tracking branch 'upstream/main' into linenos
iritkatriel Oct 7, 2022
f8d061b
Merge branch 'main' into linenos
JelleZijlstra Oct 7, 2022
0df1e0c
typedef of the location struct
iritkatriel Oct 7, 2022
e09f741
Merge branch 'main' into linenos
iritkatriel Oct 8, 2022
80393a3
Merge branch 'main' into linenos
iritkatriel Oct 16, 2022
8e7acf6
int --> Py_ssize_t. renamed last_location_in_body --> location_of_las…
iritkatriel Oct 17, 2022
5418bb5
removed CHANGED comment indicating where line numbers were not perfec…
iritkatriel Oct 17, 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
find last loc in finally body
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 6, 2022
commit c50ff3632f2967865c2070f60c00c466b8c75bd7
25 changes: 21 additions & 4 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,10 +1652,6 @@ cfg_builder_addop_j(cfg_builder *g, struct location loc,
#define ADDOP_INPLACE(C, LOC, BINOP) \
RETURN_IF_FALSE(addop_binary((C), (LOC), (BINOP), true))

/* VISIT and VISIT_SEQ takes an ASDL type as their second argument. They use
the ASDL name to synthesize the name of the C type and the visit function.
*/

#define ADD_YIELD_FROM(C, LOC, await) \
RETURN_IF_FALSE(compiler_add_yield_from((C), (LOC), (await)))

Expand All @@ -1665,6 +1661,10 @@ cfg_builder_addop_j(cfg_builder *g, struct location loc,
#define ADDOP_YIELD(C, LOC) \
RETURN_IF_FALSE(addop_yield((C), (LOC)))

/* VISIT and VISIT_SEQ takes an ASDL type as their second argument. They use
the ASDL name to synthesize the name of the C type and the visit function.
*/

#define VISIT(C, TYPE, V) {\
if (!compiler_visit_ ## TYPE((C), (V))) \
return 0; \
Expand Down Expand Up @@ -3307,6 +3307,18 @@ compiler_continue(struct compiler *c, struct location loc)
}


static struct location
last_location_in_body(asdl_stmt_seq *stmts)
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
{
for (int i = asdl_seq_LEN(stmts) - 1; i >= 0; i++) {
Copy link
Copy Markdown
Member

@markshannon markshannon Oct 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WIndows warning. Use Py_ssize_t instead of int.

Copy link
Copy Markdown
Member Author

@iritkatriel iritkatriel Oct 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this? There are a few other for loops with int variable in this file, I don't know if they need to change too.

struct location loc = LOC((stmt_ty)asdl_seq_GET(stmts, i));
if (loc.lineno > 0) {
return loc;
}
}
return NO_LOCATION;
}

/* Code generated for "try: <body> finally: <finalbody>" is as follows:

SETUP_FINALLY L
Expand Down Expand Up @@ -3362,6 +3374,7 @@ compiler_try_finally(struct compiler *c, stmt_ty s)
ADDOP(c, NO_LOCATION, POP_BLOCK);
compiler_pop_fblock(c, FINALLY_TRY, body);
VISIT_SEQ(c, stmt, s->v.Try.finalbody);

ADDOP_JUMP(c, NO_LOCATION, JUMP, exit);
/* `finally` block */

Expand All @@ -3374,6 +3387,7 @@ compiler_try_finally(struct compiler *c, stmt_ty s)
if (!compiler_push_fblock(c, loc, FINALLY_END, end, NO_LABEL, NULL))
return 0;
VISIT_SEQ(c, stmt, s->v.Try.finalbody);
loc = last_location_in_body(s->v.Try.finalbody);
compiler_pop_fblock(c, FINALLY_END, end);

ADDOP_I(c, loc, RERAISE, 0); // CHANGED
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -3412,6 +3426,7 @@ compiler_try_star_finally(struct compiler *c, stmt_ty s)
ADDOP(c, NO_LOCATION, POP_BLOCK);
compiler_pop_fblock(c, FINALLY_TRY, body);
VISIT_SEQ(c, stmt, s->v.TryStar.finalbody);

ADDOP_JUMP(c, NO_LOCATION, JUMP, exit);

/* `finally` block */
Expand All @@ -3425,6 +3440,8 @@ compiler_try_star_finally(struct compiler *c, stmt_ty s)
return 0;
}
VISIT_SEQ(c, stmt, s->v.TryStar.finalbody);
loc = last_location_in_body(s->v.Try.finalbody);

compiler_pop_fblock(c, FINALLY_END, end);
ADDOP_I(c, loc, RERAISE, 0); // CHANGED

Expand Down