Fix merge problems

Co-Authored-By: Brandt Bucher <[email protected]>

Author: Fidget-Spinner

Python/bytecodes.c

@@ -3114,10 +3114,12 @@ dummy_func(
                     _PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit_Ex(tstate,
                                                                                 (PyFunctionObject *)func, locals,
                                                                                 nargs, callargs, kwargs);
-                    STACK_SHRINK(2); /* get rid of func and NULL */
+                    // Need to manually shrinkg the stack since we exit with DISPATCH_INLINED.
+                    STACK_SHRINK(oparg + 3);
                     if (new_frame == NULL) {
                         goto error;
                     }
+                    frame->return_offset = 0;
                     DISPATCH_INLINED(new_frame);
                 }
                 result = PyObject_Call(func, callargs, kwargs);

Python/ceval.c

@@ -1513,6 +1513,7 @@ _PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
 {
     bool has_dict = (kwargs != NULL && PyDict_GET_SIZE(kwargs) > 0);
     PyObject *kwnames = NULL;
+    PyObject *const *newargs;
     if (has_dict) {
         newargs = _PyStack_UnpackDict(tstate, _PyTuple_ITEMS(callargs), nargs, kwargs, &kwnames);
         if (newargs == NULL) {