Move builtins-watched to correct scope

Author: markshannon

Include/internal/pycore_optimizer.h

@@ -273,8 +273,6 @@ PyJitRef_IsBorrowed(JitOptRef ref)
 }
 
 struct _Py_UOpsAbstractFrame {
-    bool builtins_watched;
-     // Has the globals dict of this frame been watched?
     bool globals_watched;
      // The version number of the globals dicts, once checked. 0 if unchecked.
     uint32_t globals_checked_version;
@@ -300,6 +298,8 @@ 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];

Python/optimizer_analysis.c

@@ -320,6 +320,7 @@ optimize_uops(
     ctx->done = false;
     ctx->out_of_space = false;
     ctx->contradiction = false;
+    ctx->builtins_watched = false;
 
     _PyUOpInstruction *this_instr = NULL;
     for (int i = 0; !ctx->done; i++) {

Python/optimizer_bytecodes.c

@@ -1268,9 +1268,9 @@ dummy_func(void) {
             /* Do nothing */
         }
         else {
-            if (!ctx->frame->builtins_watched) {
+            if (!ctx->builtins_watched) {
                 PyDict_Watch(BUILTINS_WATCHER_ID, builtins);
-                ctx->frame->builtins_watched = true;
+                ctx->builtins_watched = true;
             }
             if (ctx->frame->globals_checked_version != 0 && ctx->frame->globals_watched) {
                 cnst = convert_global_to_const(this_instr, builtins, false);

Python/optimizer_cases.c.h

@@ -828,7 +828,6 @@ _Py_uop_frame_new(
     frame->stack = frame->locals + co->co_nlocalsplus;
     frame->stack_pointer = frame->stack + curr_stackentries;
     frame->globals_checked_version = 0;
-    frame->builtins_watched = false;
     frame->globals_watched = false;
     frame->func = NULL;
     ctx->n_consumed = ctx->n_consumed + (co->co_nlocalsplus + co->co_stacksize);