Improve handling of _POP_TOP_LOAD_CONST_INLINE_BORROW and _REPLACE_WITH_TRUE

Author: brandtbucher

Python/optimizer_analysis.c

@@ -543,6 +543,7 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)
                 last_set_ip = pc;
                 break;
             case _POP_TOP:
+            case _POP_TOP_LOAD_CONST_INLINE_BORROW:
             {
                 _PyUOpInstruction *last = &buffer[pc-1];
                 while (last->opcode == _NOP) {
@@ -554,9 +555,14 @@ remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)
                     last->opcode == _COPY
                 ) {
                     last->opcode = _NOP;
-                    buffer[pc].opcode = _NOP;
+                    if (buffer[pc].opcode == _POP_TOP_LOAD_CONST_INLINE_BORROW) {
+                        buffer[pc].opcode = _LOAD_CONST_INLINE_BORROW;
+                    }
+                    else {
+                        buffer[pc].opcode = _NOP;
+                    }
                 }
-                if (last->opcode == _REPLACE_WITH_TRUE) {
+                if (last->opcode == _POP_TOP_LOAD_CONST_INLINE_BORROW) {
                     last->opcode = _NOP;
                 }
                 break;

Python/optimizer_bytecodes.c

@@ -922,6 +922,12 @@ dummy_func(void) {
         self_or_null = sym_new_unknown(ctx);
     }
 
+    op(_REPLACE_WITH_TRUE, (value -- res)) {
+        (void)value;
+        REPLACE_OP(this_instr, _POP_TOP_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)Py_True);
+        res = sym_new_const(ctx, Py_True);
+    }
+
     op(_JUMP_TO_TOP, (--)) {
         ctx->done = true;
     }