Refactor loader heap backout adapter to remove multiple inheritance#125867
Merged
rcj1 merged 1 commit intodotnet:mainfrom Mar 23, 2026
Merged
Refactor loader heap backout adapter to remove multiple inheritance#125867rcj1 merged 1 commit intodotnet:mainfrom
rcj1 merged 1 commit intodotnet:mainfrom
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
|
Tagging subscribers to this area: @agocke |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors LoaderHeap backout handling to eliminate UnlockedLoaderHeapBase’s multiple inheritance from ILoaderHeapBackout, replacing it with a small composed adapter object that forwards backout calls to the owning heap.
Changes:
- Remove
ILoaderHeapBackoutas a base class ofUnlockedLoaderHeapBaseand introduce a nestedLoaderHeapBackoutadapter member. - Route
TaggedMemAllocPtr::m_pHeapassignments throughGetBackoutInterface()rather than assigningthis. - Ensure derived heaps’
RealBackoutMemmethods are explicitly markedoverrideto match the new virtual inUnlockedLoaderHeapBase.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/coreclr/utilcode/loaderheap_shared.cpp | Initializes the new backout adapter member in UnlockedLoaderHeapBase’s constructor. |
| src/coreclr/inc/loaderheap.h | Replaces multiple inheritance with composition for backout, adds GetBackoutInterface(), and updates allocation tracking to store the adapter interface. |
Contributor
|
/ba-g timeout |
rcj1
added a commit
that referenced
this pull request
Mar 24, 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.
A more complete example of what I was talking about in #125129 (comment). We can either merge this PR or close it and incorporate similar changes in 125129