Skip to content

Fix reporting GC fields from base types #111011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Fix reporting GC fields from base types #111011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a3ef4
Fix reporting GC fields from base types
MichalStrehovsky Dec 31, 2024
6862c67
Update corinfo.h
MichalStrehovsky Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/coreclr/inc/corinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,10 +2377,10 @@ class ICorStaticInfo
bool fDoubleAlignHint = false
) = 0;

// This is only called for Value classes. It returns a boolean array
// in representing of 'cls' from a GC perspective. The class is
// assumed to be an array of machine words
// (of length // getClassSize(cls) / TARGET_POINTER_SIZE),
// Returns a boolean array representing 'cls' from a GC perspective.
// The class is assumed to be an array of machine words
// (of length getClassSize(cls) / TARGET_POINTER_SIZE for value classes
// and getHeapClassSize(cls) / TARGET_POINTER_SIZE for reference types),
// 'gcPtrs' is a pointer to an array of uint8_ts of this length.
// getClassGClayout fills in this array so that gcPtrs[i] is set
// to one of the CorInfoGCType values which is the GC type of
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,6 +2312,10 @@ private int MarkGcField(byte* gcPtrs, CorInfoGCType gcType)
private int GatherClassGCLayout(MetadataType type, byte* gcPtrs)
{
int result = 0;

if (type.MetadataBaseType is { ContainsGCPointers: true } baseType)
result += GatherClassGCLayout(baseType, gcPtrs);

bool isInlineArray = type.IsInlineArray;

foreach (var field in type.GetFields())
Expand Down
Loading