Repository navigation
refactor: use PyThreadState_GetInterpreter() instead of tstate->interp - #6230
Merged
rwgk merged 2 commits intoOct 31, 2026
Merged
Conversation
PyThreadState is opaque under the stable ABI; the accessor function is public since Python 3.9. Older PyPy (e.g. 7.3.19 / PyPy 3.10) does not provide it, so PyPy keeps reading tstate->interp. See pybind#6104 (B8). Assisted-by: ClaudeCode:claude-opus-5-5
— codex GPT-6 on behalf of Ralf — Keep direct thread-state field access for PyPy 7.x, since some releases lack PyThreadState_GetInterpreter. Use the public accessor on PyPy 8.x, where it is available for both supported Python versions.
rwgk
approved these changes
Oct 31, 2026
This file contains hidden or 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
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.
🤖 AI text below 🤖
Description
Replace direct reads of
tstate->interpindetail/internals.handsubinterpreter.hwith the publicPyThreadState_GetInterpreter()(available since CPython 3.9). A smalldetail::get_interpreter(PyThreadState *)helper keeps the call sites clean.PyThreadStateis opaque under the stable ABI, so this is groundwork for that work, but it stands on its own. It comes out of #6104 (finding B8).PyThreadState_GetInterpreter; 7.3.23 and 8.0 do. pybind11 supports PyPy 7.3.17+, so the helper keepststate->interpunderPYPY_VERSION.PyThreadState_GetInterpreter, so GraalPy uses the CPython path.Suggested changelog entry:
PyThreadState_GetInterpreter()instead of readingPyThreadState::interpdirectly.