Address PR comments

Author: johng

Python/optimizer_analysis.c

@@ -178,9 +178,8 @@ watch_type(PyTypeObject *type, _PyBloomFilter *filter)
     _Py_BloomFilter_Add(filter, type);
 }
 
-/* Look up the value INST would load from OBJ, without modifying INST. */
 static PyObject *
-lookup_global_const(_PyUOpInstruction *inst, PyObject *obj)
+convert_global_to_const(_PyUOpInstruction *inst, PyObject *obj)
 {
     assert(inst->opcode == _LOAD_GLOBAL_MODULE || inst->opcode == _LOAD_GLOBAL_BUILTINS || inst->opcode == _LOAD_ATTR_MODULE);
     assert(PyDict_CheckExact(obj));
@@ -200,17 +199,6 @@ lookup_global_const(_PyUOpInstruction *inst, PyObject *obj)
     if (res == NULL) {
         return NULL;
     }
-    return res;
-}
-
-/* Rewrite INST in place into a load of the constant it fetches from OBJ. */
-static PyObject *
-convert_global_to_const(_PyUOpInstruction *inst, PyObject *obj)
-{
-    PyObject *res = lookup_global_const(inst, obj);
-    if (res == NULL) {
-        return NULL;
-    }
     if (_Py_IsImmortal(res)) {
         inst->opcode = _LOAD_CONST_INLINE_BORROW;
     } else {

Python/optimizer_bytecodes.c

@@ -2527,19 +2527,16 @@ dummy_func(void) {
                 PyDict_Watch(BUILTINS_WATCHER_ID, builtins);
                 ctx->builtins_watched = true;
             }
-            if (ctx->frame->globals_checked_version != 0 && ctx->frame->globals_watched) {
-                cnst = lookup_global_const(this_instr, builtins);
+            if (ctx->frame->globals_checked_version != 0 &&
+                ctx->frame->globals_watched &&
+                uop_buffer_remaining_space(&ctx->out_buffer) >= 2)
+            {
+                cnst = convert_global_to_const(this_instr, builtins);
                 if (cnst != NULL) {
-                    /* Emitting two uops in place of one: make sure they fit. */
-                    if (uop_buffer_remaining_space(&ctx->out_buffer) < 2) {
-                        cnst = NULL;
-                    }
-                    else {
-                        ADD_OP(_GUARD_BUILTINS_IS_CANONICAL, 0, 0);
-                        ADD_OP(_Py_IsImmortal(cnst) ? _LOAD_CONST_INLINE_BORROW
-                                                    : _LOAD_CONST_INLINE,
-                               0, (uintptr_t)cnst);
-                    }
+                    /* convert_global_to_const already chose the right
+                     * _LOAD_CONST_INLINE[_BORROW] opcode; reuse it. */
+                    ADD_OP(_GUARD_BUILTINS_IS_CANONICAL, 0, 0);
+                    ADD_OP(this_instr->opcode, 0, (uintptr_t)cnst);
                 }
             }
         }