GH-100987: Allow objects other than code objects as the "executable" of an internal frame. #105727
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iritkatriel
reviewed
Jun 14, 2023
| @@ -148,23 +148,25 @@ PyUnstable_SetOptimizer(_PyOptimizerObject *optimizer) | |||
| _PyInterpreterFrame * | |||
| _PyOptimizer_BackEdge(_PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest, PyObject **stack_pointer) | |||
| { | |||
| PyCodeObject *code = (PyCodeObject *)frame->f_executable; | |||
| assert(PyCode_Check(code)); | |||
There was a problem hiding this comment.
should this assert come before the cast?
There was a problem hiding this comment.
Doesn't matter. The cast doesn't do anything until it is used.
iritkatriel
approved these changes
Jun 14, 2023
iritkatriel
approved these changes
Jun 14, 2023
hauntsaninja
pushed a commit
to python/mypy
that referenced
this pull request
Jul 7, 2024
The `_PyInterpreterFrame` struct was changed in python/cpython#105727 to store the code object in `f_executable` instead of `f_code`. Fixes ```cpp /home/runner/work/mypy/mypy/mypyc/lib-rt/pythonsupport.h: In function ‘_PyGen_GetCode’: (diff) /home/runner/work/mypy/mypy/mypyc/lib-rt/pythonsupport.h:403:17: error: ‘_PyInterpreterFrame’ has no member named ‘f_code’ (diff) 403 | return frame->f_code; (diff) | ^~ (diff) ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is incomplete implementation of #100987. A full implementation will need a bit more discussion between producers of frames, Cython, MyPyc, etc and consumers, PySpy, Austin, etc.
Rather than wait for a full specification, this PR implements a limited version, as CPython is also a producer and consumer of frames, and we need this to simplify and speed optimizations.
Without this PR we need to create fake code objects for shims and other "artificial" frames, such as those introduced when specializing calls and operators.
This is a more limited version of #103010