fix merge conflicts

Author: Fidget-Spinner

Python/bytecodes.c

@@ -4051,8 +4051,8 @@ dummy_func(
             _CALL_TUPLE_1 +
             _CHECK_PERIODIC;
 
-        tier2 op(_CHECK_INIT_MATCHES_VERSIONS, (type_version/2, init_func_version/2, callable, null, args[oparg] -- callable, null, args[oparg])) {
-            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable[0]);
+        tier2 op(_CHECK_INIT_MATCHES_VERSIONS, (type_version/2, init_func_version/2, callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
+            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
             DEOPT_IF(!PyType_Check(callable_o));
             PyTypeObject *tp = (PyTypeObject *)callable_o;
             DEOPT_IF(tp->tp_version_tag != type_version);

Python/executor_cases.c.h

@@ -808,7 +808,7 @@ translate_bytecode_to_trace(
                                 if (typ == NULL || !PyType_HasFeature(typ, Py_TPFLAGS_HEAPTYPE)) {
                                     DPRINTF(2, "Bailing due to dynamic target\n");
                                     ADD_TO_TRACE(uop, oparg, 0, target);
-                                    ADD_TO_TRACE(_DYNAMIC_EXIT, 0, 0, 0);
+                                    ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0);
                                     goto done;
                                 }
                                 assert(PyType_HasFeature(typ, Py_TPFLAGS_HEAPTYPE));
@@ -819,7 +819,7 @@ translate_bytecode_to_trace(
                                     != ((PyCodeObject *)((PyFunctionObject *)init)->func_code)->co_version) {
                                     DPRINTF(2, "Bailing due to non-matching __init__\n");
                                     ADD_TO_TRACE(uop, oparg, 0, target);
-                                    ADD_TO_TRACE(_DYNAMIC_EXIT, 0, 0, 0);
+                                    ADD_TO_TRACE(_EXIT_TRACE, 0, 0, 0);
                                     goto done;
                                 }
                                 PyFunctionObject *init_func = (PyFunctionObject *)init;