fix merge problems

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -41,6 +41,9 @@ typedef struct _JitOptContext {
     // Arena for the symbolic types.
     ty_arena t_arena;
 
+    // Pool to store promoted constants to be used at runtime.
+    PyObject *constant_pool;
+
     /* To do -- We could make this more space efficient
      * by using a single array and growing the stack and
      * locals toward each other. */

Python/optimizer.c

@@ -115,7 +115,7 @@ insert_executor(PyCodeObject *code, _Py_CODEUNIT *instr, int index, _PyExecutorO
 
 static _PyExecutorObject *
 make_executor_from_uops(_PyThreadStateImpl *tstate, _PyUOpInstruction *buffer,
-    int length, const _PyBloomFilter *dependencies, PyObject **constant_pool_ptr);
+    int length, const _PyBloomFilter *dependencies, PyObject *constant_pool);
 
 static int
 uop_optimize(_PyInterpreterFrame *frame, PyThreadState *tstate,
@@ -1378,7 +1378,7 @@ sanity_check(_PyExecutorObject *executor)
  */
 static _PyExecutorObject *
 make_executor_from_uops(_PyThreadStateImpl *tstate, _PyUOpInstruction *buffer,
-    int length, const _PyBloomFilter *dependencies, PyObject **constant_pool_ptr)
+    int length, const _PyBloomFilter *dependencies, PyObject *constant_pool)
 {
     int exit_count = count_exits(buffer, length);
     _PyExecutorObject *executor = allocate_executor(exit_count, length, constant_pool);