gh-114314: Move types to ctypes_state - #114316
Closed
vstinner wants to merge 3 commits into
Closed
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Move types to the ctypes_state structure: * PyCArray_Type * PyCData_Type * PyCFuncPtr_Type * PyCPointer_Type * Simple_Type The following macros get an additional state parameter: * ArrayObject_Check() * CDataObject_Check() * CDataObject_CheckExact() * PointerObject_Check() * PyCFuncPtrObject_Check() The following function gets an additional state parameter: * _PyCData_set() Co-Authored-By: neonene <53406459+neonene@users.noreply.github.com>
Copy link
Copy Markdown
Member
Author
|
This change only prepares the code to convert static types to heap types. It doesn't change the behavior. It only moves references to types from global variables to the _ctypes state and pass the state to macros and functions using it. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
To keep this change as small as possible, I didn't change the following macros to add a new state parameter. #define PyCSimpleTypeObject_CheckExact(v) Py_IS_TYPE(v, GLOBAL_STATE()->PyCSimpleType_Type) #define PyCSimpleTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCSimpleType_Type) #define PyCArrayTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCArrayType_Type) #define PyCPointerTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCPointerType_Type) #define PyCFuncPtrTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCFuncPtrType_Type) #define PyCStructTypeObject_Check(v) PyObject_TypeCheck(v, GLOBAL_STATE()->PyCStructType_Type) These macros can be changed afterwards. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
PR #113857, which expects fewer follow-up PRs, can be closed after this is landed. |
Sorry, something went wrong.
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
2 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.
Move types to the ctypes_state structure:
The following macros get an additional state parameter:
The following function gets an additional state parameter: