May 4, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 30, 2024
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
        class C:
            def m(self):
                pass
        callables = [f, C.m, [].__len__]
        callables = [f, C.m, [].__len__]
        for c in callables:
            for _ in range(1000):
                try:
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
            _PUSH_FRAME;

        op(_CHECK_IS_NOT_PY_CALLABLE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
 DEOPT_IF(PyFunction_Check(callable));
 DEOPT_IF(Py_TYPE(callable) == &PyMethod_Type);
 EXIT_IF(PyFunction_Check(callable));
 EXIT_IF(Py_TYPE(callable) == &PyMethod_Type);
        }

        op(_CALL_NON_PY_GENERAL, (callable, self_or_null, args[oparg] -- res)) {
            _CHECK_PERIODIC;

        op(_CHECK_CALL_BOUND_METHOD_EXACT_ARGS, (callable, null, unused[oparg] -- callable, null, unused[oparg])) {
 DEOPT_IF(null != NULL);
 DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type);
 EXIT_IF(null != NULL);
 EXIT_IF(Py_TYPE(callable) != &PyMethod_Type);
        }

        op(_INIT_CALL_BOUND_METHOD_EXACT_ARGS, (callable, unused, unused[oparg] -- func, self, unused[oparg])) {
diff --git a/Python/ceval.c b/Python/ceval.c
 dump_stack(_PyInterpreterFrame *frame, PyObject **stack_pointer)
 {
    PyObject **stack_base = _PyFrame_Stackbase(frame);
 //PyObject *exc = PyErr_GetRaisedException();
    PyObject *exc = PyErr_GetRaisedException();
    printf("    stack=[");
    for (PyObject **ptr = stack_base; ptr < stack_pointer; ptr++) {
        if (ptr != stack_base) {
            printf("<nil>");
            continue;
        }
        if (
            *ptr == Py_None
            || PyBool_Check(*ptr)
            || PyLong_CheckExact(*ptr)
            || PyFloat_CheckExact(*ptr)
            || PyUnicode_CheckExact(*ptr)
        ) {
            if (PyObject_Print(*ptr, stdout, 0) == 0) {
                continue;
            }
            PyErr_Clear();
        }
        // Don't call __repr__(), it might recurse into the interpreter.
        printf("<%s at %p>", Py_TYPE(*ptr)->tp_name, (void *)(*ptr));
    }
    printf("]\n");
 //fflush(stdout);
 //PyErr_SetRaisedException(exc);
    fflush(stdout);
    PyErr_SetRaisedException(exc);
 }

 static void
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,7 @@ def f():
		class C:
		def m(self):
		pass
		callables = [f, C.m, [].__len__]
		callables = [f, C.m, [].__len__]
		for c in callables:
		for _ in range(1000):
		try:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3213,8 +3213,8 @@ dummy_func(
		_PUSH_FRAME;

		op(_CHECK_IS_NOT_PY_CALLABLE, (callable, unused, unused[oparg] -- callable, unused, unused[oparg])) {
		DEOPT_IF(PyFunction_Check(callable));
		DEOPT_IF(Py_TYPE(callable) == &PyMethod_Type);
		EXIT_IF(PyFunction_Check(callable));
		EXIT_IF(Py_TYPE(callable) == &PyMethod_Type);
		}

		op(_CALL_NON_PY_GENERAL, (callable, self_or_null, args[oparg] -- res)) {
Expand DownExpand Up		@@ -3247,8 +3247,8 @@ dummy_func(
		_CHECK_PERIODIC;

		op(_CHECK_CALL_BOUND_METHOD_EXACT_ARGS, (callable, null, unused[oparg] -- callable, null, unused[oparg])) {
		DEOPT_IF(null != NULL);
		DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type);
		EXIT_IF(null != NULL);
		EXIT_IF(Py_TYPE(callable) != &PyMethod_Type);
		}

		op(_INIT_CALL_BOUND_METHOD_EXACT_ARGS, (callable, unused, unused[oparg] -- func, self, unused[oparg])) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,7 +107,7 @@ static void
		dump_stack(_PyInterpreterFrame frame, PyObject *stack_pointer)
Copy link Member brandtbucherMay 3, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Are the changes in this function intentional, or left over from debugging? Copy link MemberAuthor markshannonMay 4, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Left over from debugging, I needed them as`dump_stack` was too slow for a realistic number (many millions) of instructions for finding bugs. It might be worth making this change, but that's for another PR.
		{
		PyObject **stack_base = _PyFrame_Stackbase(frame);
		//PyObject *exc = PyErr_GetRaisedException();
		PyObject *exc = PyErr_GetRaisedException();
		printf(" stack=[");
		for (PyObject **ptr = stack_base; ptr < stack_pointer; ptr++) {
		if (ptr != stack_base) {
Expand All		@@ -117,12 +117,24 @@ dump_stack(_PyInterpreterFrame frame, PyObject *stack_pointer)
		printf("<nil>");
		continue;
		}
		if (
		*ptr == Py_None
		\|\| PyBool_Check(*ptr)
		\|\| PyLong_CheckExact(*ptr)
		\|\| PyFloat_CheckExact(*ptr)
		\|\| PyUnicode_CheckExact(*ptr)
		) {
		if (PyObject_Print(*ptr, stdout, 0) == 0) {
		continue;
		}
		PyErr_Clear();
		}
		// Don't call __repr__(), it might recurse into the interpreter.
		printf("<%s at %p>", Py_TYPE(ptr)->tp_name, (void )(*ptr));
		}
		printf("]\n");
		//fflush(stdout);
		//PyErr_SetRaisedException(exc);
		fflush(stdout);
		PyErr_SetRaisedException(exc);
		}

		static void
Expand Down