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
remove u_loc from compiler_unit
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 6, 2022
commit 8fd667dc07da435f67b0571074766a91eb9042ba
18 changes: 3 additions & 15 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ struct compiler_unit {
struct fblockinfo u_fblock[CO_MAXBLOCKS];

int u_firstlineno; /* the first lineno of the block */
struct location u_loc; /* line/column info of the current stmt */
};

/* This struct captures the global state of a compilation.
Expand Down Expand Up @@ -990,10 +989,10 @@ basicblock_next_instr(basicblock *b)
- before the "except" and "finally" clauses
*/

#define SET_LOC(c, x) (c)->u->u_loc = LOC(x);
#define SET_LOC(c, x)

// Artificial instructions
#define UNSET_LOC(c) (c)->u->u_loc = NO_LOCATION;
#define UNSET_LOC(c)

#define LOC(x) LOCATION((x)->lineno, \
(x)->end_lineno, \
Expand Down Expand Up @@ -1733,7 +1732,6 @@ compiler_enter_scope(struct compiler *c, identifier name,

u->u_nfblocks = 0;
u->u_firstlineno = lineno;
u->u_loc = loc;
u->u_consts = PyDict_New();
if (!u->u_consts) {
compiler_unit_free(u);
Expand Down Expand Up @@ -1770,7 +1768,6 @@ compiler_enter_scope(struct compiler *c, identifier name,

if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
loc.lineno = 0;
c->u->u_loc = loc;
}
else {
if (!compiler_set_qualname(c))
Expand All @@ -1780,7 +1777,6 @@ compiler_enter_scope(struct compiler *c, identifier name,

if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
loc.lineno = -1;
c->u->u_loc = loc;
}
return 1;
}
Expand Down Expand Up @@ -2159,7 +2155,6 @@ compiler_mod(struct compiler *c, mod_ty mod)
return NULL;
}
struct location loc = LOCATION(1, 1, 0, 0);
c->u->u_loc = loc;
switch (mod->kind) {
case Module_kind:
if (!compiler_body(c, loc, mod->v.Module.body)) {
Expand Down Expand Up @@ -2303,13 +2298,11 @@ compiler_apply_decorators(struct compiler *c, asdl_expr_seq* decos)
if (!decos)
return 1;

struct location old_loc = c->u->u_loc;
for (Py_ssize_t i = asdl_seq_LEN(decos) - 1; i > -1; i--) {
SET_LOC(c, (expr_ty)asdl_seq_GET(decos, i));
struct location loc = LOC((expr_ty)asdl_seq_GET(decos, i));
ADDOP_I(c, loc, CALL, 0);
}
c->u->u_loc = old_loc;
return 1;
}

Expand Down Expand Up @@ -4809,7 +4802,6 @@ update_start_location_to_match_attr(struct compiler *c, struct location loc,
loc.end_col_offset = Py_MAX(loc.col_offset, loc.end_col_offset);
}
}
c->u->u_loc = loc;
return loc;
}

Expand Down Expand Up @@ -5933,10 +5925,8 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
static int
compiler_visit_expr(struct compiler *c, expr_ty e)
{
struct location old_loc = c->u->u_loc;
SET_LOC(c, e);
int res = compiler_visit_expr1(c, e);
c->u->u_loc = old_loc;
return res;
}

Expand All @@ -5954,7 +5944,6 @@ compiler_augassign(struct compiler *c, stmt_ty s)
expr_ty e = s->v.AugAssign.target;

struct location loc = LOC(e);
struct location old_loc = c->u->u_loc;
SET_LOC(c, e);

switch (e->kind) {
Expand Down Expand Up @@ -5993,8 +5982,7 @@ compiler_augassign(struct compiler *c, stmt_ty s)
return 0;
}

c->u->u_loc = old_loc;
loc = old_loc;
loc = LOC(s);

VISIT(c, expr, s->v.AugAssign.value);
ADDOP_INPLACE(c, loc, s->v.AugAssign.op);
Expand Down