Merge branch 'main' into dev_143414

Fidget-Spinner · Jan 30, 2026 · Jan 20, 2026 · Jan 21, 2026 · Jan 21, 2026 · Jan 22, 2026
commit 2e9c5a6504d5213b3902372d46b549d550b97004
diff --git a/Include/internal/pycore_optimizer.h b/Include/internal/pycore_optimizer.h
@@ -298,6 +298,8 @@ extern void _Py_uop_sym_set_compact_int(JitOptContext *ctx,  JitOptRef sym);
 extern JitOptRef _Py_uop_sym_new_slots_object(JitOptContext *ctx, unsigned int type_version);
 extern JitOptRef _Py_uop_sym_slots_getattr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index);
 extern void _Py_uop_sym_slots_setattr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index, JitOptRef value);
+extern JitOptRef _Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef lhs_ref, JitOptRef rhs_ref, JitOptPredicateKind kind);
+extern void _Py_uop_sym_apply_predicate_narrowing(JitOptContext *ctx, JitOptRef sym, bool branch_is_true);
 
 extern void _Py_uop_abstractcontext_init(JitOptContext *ctx);
 extern void _Py_uop_abstractcontext_fini(JitOptContext *ctx);

diff --git a/Include/internal/pycore_optimizer_types.h b/Include/internal/pycore_optimizer_types.h
@@ -44,7 +44,8 @@ typedef enum _JitSymType {
     JIT_SYM_TUPLE_TAG = 8,
     JIT_SYM_TRUTHINESS_TAG = 9,
     JIT_SYM_COMPACT_INT = 10,
-    JIT_SYM_SLOTS_TAG = 11,
+    JIT_SYM_PREDICATE_TAG = 11,
+    JIT_SYM_SLOTS_TAG = 12,
 } JitSymType;
 
 typedef struct _jit_opt_known_class {
@@ -114,6 +115,7 @@ typedef union _jit_opt_symbol {
     JitOptTruthiness truthiness;
     JitOptCompactInt compact;
     JitOptSlotsObject slots;
+    JitOptPredicate predicate;
 } JitOptSymbol;
 
 // This mimics the _PyStackRef API
@@ -148,31 +150,6 @@ typedef struct slots_arena {
     JitOptSlotMapping arena[SLOTS_ARENA_SIZE];
 } slots_arena;
 
-typedef struct _JitOptContext {
-    char done;
-    char out_of_space;
-    bool contradiction;
-    // Has the builtins dict been watched?
-    bool builtins_watched;
-    // The current "executing" frame.
-    _Py_UOpsAbstractFrame *frame;
-    _Py_UOpsAbstractFrame frames[MAX_ABSTRACT_FRAME_DEPTH];
-    int curr_frame_depth;
-
-    // Arena for the symbolic types.
-    ty_arena t_arena;
-
-    // Arena for slots mappings.
-    slots_arena s_arena;
-
-    JitOptRef *n_consumed;
-    JitOptRef *limit;
-    JitOptRef locals_and_stack[MAX_ABSTRACT_INTERP_SIZE];
-    _PyUOpInstruction *out_buffer;
-    int out_len;
-} JitOptContext;
-
-
 #ifdef __cplusplus
 }
 #endif

@@ -250,6 +250,8 @@ add_op(JitOptContext *ctx, _PyUOpInstruction *this_instr,
 #define sym_new_slots_object _Py_uop_sym_new_slots_object
 #define sym_slots_getattr _Py_uop_sym_slots_getattr
 #define sym_slots_setattr _Py_uop_sym_slots_setattr
+#define sym_new_predicate _Py_uop_sym_new_predicate
+#define sym_apply_predicate_narrowing _Py_uop_sym_apply_predicate_narrowing
 
 #define JUMP_TO_LABEL(label) goto label;
 

@@ -41,6 +41,8 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
 #define sym_new_slots_object _Py_uop_sym_new_slots_object
 #define sym_slots_getattr _Py_uop_sym_slots_getattr
 #define sym_slots_setattr _Py_uop_sym_slots_setattr
+#define sym_new_predicate _Py_uop_sym_new_predicate
+#define sym_apply_predicate_narrowing _Py_uop_sym_apply_predicate_narrowing
 
 extern int
 optimize_to_bool(