Skip to content

gh-87092: expose the compiler's codegen to python for unit tests #99111

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 19 commits into from
Nov 14, 2022
Merged

gh-87092: expose the compiler's codegen to python for unit tests #99111

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d5f14fc
extract compiler_codegen from compiler_mod
iritkatriel Nov 4, 2022
89b8357
add unit tests for codegen
iritkatriel Nov 4, 2022
ddac06a
fix whitespace
iritkatriel Nov 5, 2022
b07b9c6
fix refleak
iritkatriel Nov 5, 2022
a2a1c17
Merge branch 'main' into expose_codegen
iritkatriel Nov 5, 2022
3c1c647
Merge remote-tracking branch 'upstream/main' into expose_codegen
iritkatriel Nov 8, 2022
9bafd3a
fix flags bug
iritkatriel Nov 8, 2022
ae1e146
Merge remote-tracking branch 'upstream/main' into expose_codegen
iritkatriel Nov 8, 2022
ce45de8
regenerate files
iritkatriel Nov 8, 2022
d98f150
fix flags in _PyCompile_CodeGen
iritkatriel Nov 8, 2022
00aea64
PyCompilerFlags stored on struct compiler by value
iritkatriel Nov 9, 2022
50c0cc2
Merge remote-tracking branch 'upstream/main' into expose_codegen
iritkatriel Nov 9, 2022
61edee2
Merge remote-tracking branch 'upstream/main' into expose_codegen
iritkatriel Nov 10, 2022
ab3f67c
regen
iritkatriel Nov 10, 2022
4453129
compareInstructions --> assertInstructionsMatch
iritkatriel Nov 11, 2022
ad1ef54
new_compiler
iritkatriel Nov 11, 2022
4f51307
revert change to cfg_to_instructions
iritkatriel Nov 11, 2022
3657eca
static
iritkatriel Nov 11, 2022
9cf20ef
Merge remote-tracking branch 'upstream/main' into expose_codegen
iritkatriel Nov 14, 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
PyCompilerFlags stored on struct compiler by value
  • Loading branch information
@iritkatriel
iritkatriel committed Nov 9, 2022
commit 00aea64608a8d34c1cc5109459a5893a7d0867e5
26 changes: 10 additions & 16 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
(opcode) == STORE_FAST__STORE_FAST)

#define IS_TOP_LEVEL_AWAIT(c) ( \
(c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT) \
(c->c_flags.cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT) \
&& (c->u->u_ste->ste_type == ModuleBlock))

typedef _PyCompilerSrcLocation location;
Expand Down Expand Up @@ -418,7 +418,7 @@ struct compiler {
PyObject *c_filename;
struct symtable *c_st;
PyFutureFeatures c_future; /* module's __future__ */
PyCompilerFlags *c_flags;
PyCompilerFlags c_flags;

int c_optimize; /* optimization level */
int c_interactive; /* true if in interactive mode */
Expand Down Expand Up @@ -608,17 +608,17 @@ compiler_init(struct compiler *c)

static int
compiler_setup(struct compiler *c, mod_ty mod, PyObject *filename,
PyCompilerFlags *flags, int optimize, PyArena *arena)
PyCompilerFlags flags, int optimize, PyArena *arena)
{
Py_INCREF(filename);
c->c_filename = filename;
c->c_arena = arena;
if (!_PyFuture_FromAST(mod, filename, &c->c_future)) {
return 0;
}
int merged = c->c_future.ff_features | flags->cf_flags;
int merged = c->c_future.ff_features | flags.cf_flags;
c->c_future.ff_features = merged;
flags->cf_flags = merged;
flags.cf_flags = merged;
c->c_flags = flags;
c->c_optimize = (optimize == -1) ? _Py_GetConfig()->optimization_level : optimize;
c->c_nestlevel = 0;
Expand All @@ -641,18 +641,15 @@ compiler_setup(struct compiler *c, mod_ty mod, PyObject *filename,
}

PyCodeObject *
_PyAST_Compile(mod_ty mod, PyObject *filename, PyCompilerFlags *flags,
_PyAST_Compile(mod_ty mod, PyObject *filename, PyCompilerFlags *pflags,
int optimize, PyArena *arena)
{
struct compiler c;
if (!compiler_init(&c)) {
return NULL;
}

PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
if (!flags) {
flags = &local_flags;
}
PyCompilerFlags flags = pflags ? *pflags : _PyCompilerFlags_INIT;

PyCodeObject *co = NULL;
if (!compiler_setup(&c, mod, filename, flags, optimize, arena)) {
Comment thread
iritkatriel marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -8284,7 +8281,7 @@ compute_code_flags(struct compiler *c)
}

/* (Only) inherit compilerflags in PyCF_MASK */
flags |= (c->c_flags->cf_flags & PyCF_MASK);
flags |= (c->c_flags.cf_flags & PyCF_MASK);

if ((IS_TOP_LEVEL_AWAIT(c)) &&
ste->ste_coroutine &&
Expand Down Expand Up @@ -9968,7 +9965,7 @@ cfg_to_instructions(cfg_builder *g)
}

PyObject *
_PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *flags,
_PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *pflags,
int optimize)
{
PyObject *res = NULL;
Expand Down Expand Up @@ -9996,10 +9993,7 @@ _PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *flags,
return NULL;
}

PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
if (!flags) {
flags = &local_flags;
}
PyCompilerFlags flags = pflags ? *pflags : _PyCompilerFlags_INIT;
if (!compiler_setup(&c, mod, filename, flags, optimize, arena)) {
goto finally;
}
Expand Down