Fix the crashes

Author: brandtbucher

Python/optimizer_analysis.c

@@ -523,14 +523,7 @@ optimize_uops(
 
 }
 
-const uint16_t op_without_pop[MAX_UOP_ID] = {
-    [_POP_TOP] = _NOP,
-    [_POP_TOP_LOAD_CONST_INLINE] = _LOAD_CONST_INLINE,
-    [_POP_TOP_LOAD_CONST_INLINE_BORROW] = _LOAD_CONST_INLINE_BORROW,
-    [_POP_TWO_LOAD_CONST_INLINE_BORROW] = _POP_TOP_LOAD_CONST_INLINE_BORROW,
-};
-
-const uint16_t op_without_push[MAX_UOP_ID] = {
+const uint16_t op_without_push[MAX_UOP_ID + 1] = {
     [_COPY] = _NOP,
     [_LOAD_CONST_INLINE] = _NOP,
     [_LOAD_CONST_INLINE_BORROW] = _NOP,
@@ -542,6 +535,13 @@ const uint16_t op_without_push[MAX_UOP_ID] = {
     [_POP_TWO_LOAD_CONST_INLINE_BORROW] = _POP_TWO,
 };
 
+const uint16_t op_without_pop[MAX_UOP_ID + 1] = {
+    [_POP_TOP] = _NOP,
+    [_POP_TOP_LOAD_CONST_INLINE] = _LOAD_CONST_INLINE,
+    [_POP_TOP_LOAD_CONST_INLINE_BORROW] = _LOAD_CONST_INLINE_BORROW,
+    [_POP_TWO_LOAD_CONST_INLINE_BORROW] = _POP_TOP_LOAD_CONST_INLINE_BORROW,
+};
+
 
 static int
 remove_unneeded_uops(_PyUOpInstruction *buffer, int buffer_size)

Python/optimizer_symbols.c

@@ -284,7 +284,7 @@ _Py_uop_sym_set_const(JitOptContext *ctx, JitOptSymbol *sym, PyObject *const_val
                         PyObject *item = PyTuple_GET_ITEM(const_val, i);
                         _Py_uop_sym_set_const(ctx, sym_item, item);
                     }
-                    _Py_uop_sym_set_const(ctx, sym, const_val);
+                    make_const(sym, const_val);
                     return;
                 }
             }