[cDAC] refactor ObjectHandle IData#127115
Merged
rcj1 merged 3 commits intodotnet:mainfrom Apr 21, 2026
Merged
Conversation
Contributor
|
Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag |
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors cDAC’s ObjectHandle IData so its constructor parameter is the address of the OBJECTHANDLE field (consistent with other IData), enabling strongly-typed ObjectHandle fields and use of ReadDataField<ObjectHandle> instead of extra pointer reads.
Changes:
- Rename the VM data type from
GCHandletoObjectHandleand update contract descriptors accordingly. - Update multiple contract data models/contracts to read OBJECTHANDLE fields via
ReadDataField<ObjectHandle>and exposeObjectHandle-typed properties. - Adjust tests and descriptor definitions to reflect the new
ObjectHandletype.
Reviewed changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/native/managed/cdac/tests/ContractDescriptor/TargetTests.cs | Updates test type/field expectations to DataType.ObjectHandle. |
| src/native/managed/cdac/tests/ContractDescriptor/TargetTests.SubDescriptors.cs | Same as above for sub-descriptor tests. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/Thread.cs | Reads thread OBJECTHANDLE fields via ReadDataField<ObjectHandle> and updates property types. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/SyncBlock.cs | Reads Lock as ObjectHandle inline data and stores it as such. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/ObjectHandle.cs | Changes ObjectHandle to interpret the input as field-address and performs the dereferences internally. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/LoaderAllocator.cs | Reads ObjectHandle field via ReadDataField<ObjectHandle>. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/InflightTLSData.cs | Reads TLSData as ObjectHandle via ReadDataField<ObjectHandle>. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/ExceptionInfo.cs | Reads and exposes ThrownObjectHandle as ObjectHandle. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Data/AssemblyBinder.cs | Reads and exposes AssemblyLoadContext as ObjectHandle. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/Thread_1.cs | Updates contract logic to use ObjectHandle.Handle / .Object instead of raw pointers. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/RuntimeTypeSystem_1.cs | Adjusts static valuetype access path to directly read the OBJECTREF from the slot. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/Loader_1.cs | Uses ObjectHandle.Object to return the ALC object directly. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/Exception_1.cs | Returns both handle and object from the new ObjectHandle representation. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/ConditionalWeakTable_1.cs | Treats depHnd as an inline ObjectHandle field address; uses .Handle for extra info lookup. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/ComWrappers_1.cs | Treats mow as the address of an inline ObjectHandle field. |
| src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Abstractions/DataType.cs | Renames GCHandle enum member to ObjectHandle. |
| src/coreclr/vm/datadescriptor/datadescriptor.inc | Updates data descriptor types/fields to declare OBJECTHANDLE-bearing fields as TYPE(ObjectHandle) and renames the type entry. |
This was referenced Apr 19, 2026
max-charlamb
approved these changes
Apr 20, 2026
Member
max-charlamb
left a comment
max-charlamb
left a comment
There was a problem hiding this comment.
LGTM, any comments @noahfalk
nit: There are some remaining references to GCHandle in docs/design/datacontracts/data_descriptor.md which should be converted to ObjectHandle
jkotas
reviewed
Apr 20, 2026
Contributor
Author
|
/ba-g wasm |
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.
ObjectHandle is a strange IData in that it expects the address parameter to be the address field of the OBJECTHANDLE as opposed to the address of the structure like in every other IData. This is annoying because it means we have to first ReadPointer from the address of the ObjectHandle before we construct one, which means these fields have to be typed as pointers instead of TYPE(ObjectHandle). With this refactoring, the parameter to ObjectHandle is now the address of the ObjectHandle, and we can type ObjectHandle fields properly and do ReadDataField where appropriate.