gh-103092: Ensure _ctypes.c static types are accessed via global state#113857
Merged
vstinner merged 5 commits intopython:mainfrom Jan 22, 2024
neonene:ctypes_ready
Merged
gh-103092: Ensure _ctypes.c static types are accessed via global state#113857vstinner merged 5 commits intopython:mainfrom neonene:ctypes_ready
_ctypes.c static types are accessed via global state#113857vstinner merged 5 commits intopython:mainfrom
neonene:ctypes_ready
Conversation
25 tasks
neonene
changed the title
_ctypes.c static types are accessed via global state
Contributor
Member
|
@erlend-aasland, do you want to review these two PRs? |
Contributor
Sure, I'll get to it later today. |
Contributor
Author
|
Done. I'll update this after #113620 is merged. |
neonene
changed the title
_ctypes.c static types are accessed via global state_ctypes.c static types are accessed via global state
neonene
changed the title
_ctypes.c static types are accessed via global state_ctypes.c static types are accessed via global state
Contributor
Author
|
I think this is ready for review. Sorry for mistakenly wiping out old commits (from web). Actual diff with a1ade06: Details--- Modules/_ctypes/_ctypes.c
+++ Modules/_ctypes/_ctypes.c
@@ -128,13 +128,6 @@
-static PyTypeObject UnionType_Type;
static PyTypeObject Union_Type;
static PyTypeObject Struct_Type;
static PyTypeObject Simple_Type;
ctypes_state global_state = {
.PyCStgDict_Type = &PyCStgDict_Type,
- .PyCStructType_Type = &PyCStructType_Type,
- .UnionType_Type = &UnionType_Type,
- .PyCPointerType_Type = &PyCPointerType_Type,
- .PyCArrayType_Type = &PyCArrayType_Type,
- .PyCSimpleType_Type = &PyCSimpleType_Type,
- .PyCFuncPtrType_Type = &PyCFuncPtrType_Type, |
aisk
reviewed
Jan 19, 2024
Contributor
|
Thanks, Victor! |
Member
|
I merged this change which is a good start for futher work. I closed my similar duplicated (less complete) PR. |
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
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
5 participants
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 sets in place the
ctypes_state *st = GLOBAL_STATE()statements to make the coming PRs smaller. Suggested by @encukou: #113630 (comment)cc @erlend-aasland