[cDAC] Refactor datadescriptor infrastructure #118453
Merged
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This pull request refactors the data descriptor infrastructure to enable creating multiple descriptors, moving from a monolithic approach to a reusable framework. The refactoring extracts common functionality into shared components and introduces a CMake function for generating descriptors.
- Extracts shared data descriptor code into a separate directory for reuse
- Introduces a CMake function
generate_data_descriptorsto streamline descriptor creation - Replaces hardcoded patterns with configurable contract names and pointer data names
- Adds comprehensive documentation for the refactored infrastructure
Reviewed Changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
src/coreclr/debug/runtimeinfo/datadescriptor.inc |
Removes wrapper macros and comments, keeping only the actual data definitions |
src/coreclr/debug/runtimeinfo/datadescriptor.h |
New header containing all necessary includes for data descriptors |
src/coreclr/debug/runtimeinfo/CMakeLists.txt |
Refactored to use the new generate_data_descriptors function instead of inline logic |
src/coreclr/debug/datadescriptor-shared/datadescriptorwrapper.inc |
New wrapper providing the macro definitions previously in datadescriptor.inc |
src/coreclr/debug/datadescriptor-shared/datadescriptor.cpp |
Moved from runtime-specific location, now includes wrapper |
src/coreclr/debug/datadescriptor-shared/contractpointerdata.cpp |
Refactored to use configurable names and support sub-descriptors |
src/coreclr/debug/datadescriptor-shared/contractdescriptorstub.c |
Updated to use configurable contract and pointer data names |
src/coreclr/debug/datadescriptor-shared/contractconfiguration.h.in |
Template for contract configuration parameters |
src/coreclr/debug/datadescriptor-shared/contract-descriptor.c.in |
Updated template to use configurable names and conditional exports |
src/coreclr/debug/datadescriptor-shared/README.md |
Comprehensive documentation for the refactored infrastructure |
src/coreclr/clrdatadescriptors.cmake |
New CMake function implementing the two-phase build process |
src/coreclr/CMakeLists.txt |
Includes the new data descriptors CMake module |
|
Tagging subscribers to this area: @steveisok, @dotnet/dotnet-diag |
max-charlamb
requested review from
davidwrighton,
jkoritzinsky,
rcj1 and
steveisok
jkoritzinsky
reviewed
Aug 6, 2025
max-charlamb
force-pushed
the
datadescriptor-refactor
branch
from
d58fdba to
8a6a118
Compare
jkoritzinsky
approved these changes
Aug 6, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Change the datadescriptor infrastructure to allow easily creating multiple descriptors. Used in #118050