JIT: update layout of BLK nodes during escape analysis #115845
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
If we retype a struct local we also need to retype any BLK operations on those locals. Fixes dotnet#115832.
github-actions
bot
added
the
area-CodeGen-coreclr
|
@dotnet/jit-contrib PTAL No diffs but a lot of missed contexts. |
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a JIT assertion by propagating updated struct layouts to BLK nodes during escape analysis retyping.
- Extended
UpdateAncestorTypesto accept a newClassLayout* newLayoutparameter. - Added
SetLayoutcalls forGT_STORE_BLKandGT_BLKnodes whenretypeFieldsis true. - Introduced a new repro test (
Runtime_115832) to catch the original assertion.
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/tests/JIT/opt/ObjectStackAllocation/*.csproj | Added optimized test project for repro case |
| src/tests/JIT/opt/ObjectStackAllocation/Runtime_115832.cs | New fuzz-generated test reproducing the JIT assert |
| src/coreclr/jit/objectalloc.h | Updated UpdateAncestorTypes signature to include newLayout |
| src/coreclr/jit/objectalloc.cpp | Implemented layout propagation to BLK nodes |
| src/coreclr/jit/gentree.h | Added GenTreeBlk::SetLayout to allow runtime layout updates |
Comments suppressed due to low confidence (2)
src/coreclr/jit/objectalloc.cpp:2196
- Consider adding a unit test that exercises the
GT_STORE_BLKretype path to ensureSetLayoutis correctly applied and prevent future regressions.
if (retypeFields && parent->OperIs(GT_STORE_BLK))
src/coreclr/jit/objectalloc.cpp:2189
- The removal of the
addr->OperIs(GT_FIELD_ADDR)check broadens theSTOREINDretyping logic beyond struct field stores, which conflicts with the existing comment. Consider restoring that guard or updating the comment to reflect the intended behavior.
if (parent->OperIs(GT_STOREIND) && varTypeIsGC(parent->TypeGet()))
| @@ -2007,6 +2007,7 @@ void ObjectAllocator::AnalyzeParentStack(ArrayStack<GenTree*>* parentStack, unsi | |||
| // tree - Possibly-stack-pointing tree | |||
| // parentStack - Parent stack of the possibly-stack-pointing tree | |||
| // newType - New type of the possibly-stack-pointing tree | |||
| // newLayout - Layout for a retyped local struct | |||
There was a problem hiding this comment.
You added a description for newLayout in the implementation comments; please update the corresponding declaration comment in objectalloc.h so the header and implementation stay in sync.
Copilot uses AI. Check for mistakes.
|
@dotnet/jit-contrib ping |
jakobbotsch
approved these changes
May 22, 2025
SimaTian
pushed a commit
that referenced
this pull request
May 27, 2025
If we retype a struct local we also need to retype any BLK operations on those locals. Fixes #115832.
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.
If we retype a struct local we also need to retype any BLK operations on those locals.
Fixes #115832.