Move globals-to-consts pass into main optimizer pass

Author: markshannon

Include/internal/pycore_optimizer.h

@@ -286,9 +286,10 @@ struct _Py_UOpsAbstractFrame {
     // Max stacklen
     int stack_len;
     int locals_len;
-    bool function_checked;
+    uint32_t globals_checked_version;
     bool builtins_watched;
     bool globals_watched;
+    PyFunctionObject *func;
 
     JitOptRef *stack_pointer;
     JitOptRef *stack;
@@ -311,7 +312,6 @@ typedef struct _JitOptContext {
     _Py_UOpsAbstractFrame *frame;
     _Py_UOpsAbstractFrame frames[MAX_ABSTRACT_FRAME_DEPTH];
     int curr_frame_depth;
-    uint32_t prechecked_function_version;
 
     // Arena for the symbolic types.
     ty_arena t_arena;