Address review comments

Author: markshannon

Include/internal/pycore_optimizer.h

@@ -273,12 +273,14 @@ 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;
     // Max stacklen
     int stack_len;
     int locals_len;
-    uint32_t globals_checked_version;
-    bool builtins_watched;
-    bool globals_watched;
     PyFunctionObject *func;
 
     JitOptRef *stack_pointer;

Python/optimizer_bytecodes.c

@@ -1254,8 +1254,7 @@ dummy_func(void) {
         ctx->frame->globals_checked_version = version;
     }
 
-    op(_LOAD_GLOBAL_BUILTINS, (version/1, index/1 -- res))
-    {
+    op(_LOAD_GLOBAL_BUILTINS, (version/1, index/1 -- res)) {
         (void)version;
         (void)index;
         PyObject *cnst = NULL;
@@ -1278,15 +1277,14 @@ dummy_func(void) {
             }
         }
         if (cnst == NULL) {
-            res = sym_new_unknown(ctx);
+            res = sym_new_not_null(ctx);
         }
         else {
             res = sym_new_const(ctx, cnst);
         }
     }
 
-    op(_LOAD_GLOBAL_MODULE, (version/1, unused/1, index/1 -- res))
-    {
+    op(_LOAD_GLOBAL_MODULE, (version/1, unused/1, index/1 -- res)) {
         (void)index;
         PyObject *cnst = NULL;
         if (ctx->frame->func != NULL) {
@@ -1314,7 +1312,7 @@ dummy_func(void) {
             }
         }
         if (cnst == NULL) {
-            res = sym_new_unknown(ctx);
+            res = sym_new_not_null(ctx);
         }
         else {
             res = sym_new_const(ctx, cnst);