Skip to content

Commit 12221c4

Browse files
jbower-fbmeta-codesync[bot]
authored andcommitted
Remove ENABLE_JIT_GENERATORS feature flag
Summary: I'm not sure why we need this? Maybe the time for it has past. If we have JIT enabled then I don't see why we wouldn't enable the generator support, and there isn't a way to disable the JIT. Reviewed By: alexmalyshev Differential Revision: D87112994 fbshipit-source-id: fa836d2d54fe9c6d064bbd4014b143aef39ff5c2
1 parent d83051f commit 12221c4

5 files changed

Lines changed: 0 additions & 22 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ set_flag(ENABLE_EVAL_HOOK)
4242
set_flag(ENABLE_FUNC_EVENT_MODIFY_QUALNAME)
4343
set_flag(ENABLE_GENERATOR_AWAITER)
4444
set_flag(ENABLE_INTERPRETER_LOOP)
45-
set_flag(ENABLE_JIT_GENERATORS)
4645
set_flag(ENABLE_LAZY_IMPORTS)
4746
set_flag(ENABLE_LIGHTWEIGHT_FRAMES)
4847
set_flag(ENABLE_PARALLEL_GC)

cinderx/Interpreter/3.14/borrowed-ceval.c.template

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
// @Borrow function _PyEvalFramePushAndInit from Python/ceval.c
7171
// @Borrow function _PyEvalFramePushAndInit_Ex from Python/ceval.c
7272

73-
#ifdef ENABLE_JIT_GENERATORS
74-
7573
// Cinder specific adapted functions
7674
static PyObject *
7775
Ci_PyEval_GetANext(PyObject *aiter)
@@ -138,13 +136,6 @@ Ci_PyEval_GetAwaitable(PyObject *iterable, int oparg)
138136
return iter;
139137
}
140138

141-
#else
142-
143-
#define Ci_PyEval_GetANext _PyEval_GetANext
144-
#define Ci_PyEval_GetAwaitable _PyEval_GetAwaitable
145-
146-
#endif
147-
148139
#if Py_TAIL_CALL_INTERP
149140
#include "cinderx/Interpreter/cinderx_opcode_targets.h"
150141
#include "cinderx/Interpreter/3.14/Includes/generated_cases.c.h"

cinderx/Interpreter/3.14/ceval.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,6 @@ _PyEvalFramePushAndInit_Ex(PyThreadState *tstate, _PyStackRef func,
10681068
return NULL;
10691069
}
10701070

1071-
#ifdef ENABLE_JIT_GENERATORS
1072-
10731071
// Cinder specific adapted functions
10741072
static PyObject *
10751073
Ci_PyEval_GetANext(PyObject *aiter)
@@ -1136,13 +1134,6 @@ Ci_PyEval_GetAwaitable(PyObject *iterable, int oparg)
11361134
return iter;
11371135
}
11381136

1139-
#else
1140-
1141-
#define Ci_PyEval_GetANext _PyEval_GetANext
1142-
#define Ci_PyEval_GetAwaitable _PyEval_GetAwaitable
1143-
1144-
#endif
1145-
11461137
#if Py_TAIL_CALL_INTERP
11471138
#include "cinderx/Interpreter/cinderx_opcode_targets.h"
11481139
#include "cinderx/Interpreter/3.14/Includes/generated_cases.c.h"

cinderx/Interpreter/3.14/interpreter.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
#include "cinderx/StaticPython/checked_list.h"
2727
#include "cinderx/StaticPython/static_array.h"
2828

29-
#ifdef ENABLE_JIT_GENERATORS
3029
#include "cinderx/Jit/generators_rt.h"
31-
#endif
3230

3331
#if !defined(ENABLE_LAZY_IMPORTS) && !defined(DK_KIND)
3432
#define DK_KIND(dk) (dk->dk_kind)

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ def set_option(var: str, default: object) -> None:
161161
set_option("ENABLE_FUNC_EVENT_MODIFY_QUALNAME", meta_312)
162162
set_option("ENABLE_GENERATOR_AWAITER", meta_312)
163163
set_option("ENABLE_INTERPRETER_LOOP", meta_312 or is_314)
164-
set_option("ENABLE_JIT_GENERATORS", meta_312)
165164
set_option("ENABLE_LAZY_IMPORTS", meta_312)
166165
set_option("ENABLE_LIGHTWEIGHT_FRAMES", meta_312)
167166
set_option("ENABLE_PARALLEL_GC", meta_312)

0 commit comments

Comments
 (0)