Skip to content

[cDAC] Fix bug in static address calculation #131712

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
hoyosjs merged 1 commit into from
Aug 2, 2026
+24 −21
Merged

[cDAC] Fix bug in static address calculation #131712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions .../cdac/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/RuntimeTypeSystem_1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2511,40 +2511,43 @@ private TargetPointer GetFieldDescStaticOrThreadStaticAddress(TargetPointer fiel
ILoader loader = _target.Contracts.Loader;
ModuleHandle moduleHandle = loader.GetModuleHandleFromModulePtr(modulePtr);
CorElementType type = ((IRuntimeTypeSystem)this).GetFieldDescType(fieldDescPointer);
TargetPointer @base;
if (type == CorElementType.Class || type == CorElementType.ValueType)
{
if (thread.HasValue)
{
@base = GetGCThreadStaticsBasePointer(ctx, thread.Value);
}
else
{
@base = GetGCStaticsBasePointer(ctx);
}
}
else
bool isRVA = ((IRuntimeTypeSystem)this).IsFieldDescRVA(fieldDescPointer);

TargetPointer @base = TargetPointer.Null;
if (!isRVA)
{
if (thread.HasValue)
if (type == CorElementType.Class || type == CorElementType.ValueType)
{
@base = GetNonGCThreadStaticsBasePointer(ctx, thread.Value);
if (thread.HasValue)
{
@base = GetGCThreadStaticsBasePointer(ctx, thread.Value);
}
else
{
@base = GetGCStaticsBasePointer(ctx);
}
}
else
{
@base = GetNonGCStaticsBasePointer(ctx);
if (thread.HasValue)
{
@base = GetNonGCThreadStaticsBasePointer(ctx, thread.Value);
}
else
{
@base = GetNonGCStaticsBasePointer(ctx);
}
}
}

if (@base == TargetPointer.Null)
return TargetPointer.Null;
if (@base == TargetPointer.Null)
return TargetPointer.Null;
}

MetadataReader mdReader = _target.Contracts.EcmaMetadata.GetMetadata(moduleHandle)!;
uint token = ((IRuntimeTypeSystem)this).GetFieldDescMemberDef(fieldDescPointer);
FieldDefinitionHandle fieldHandle = (FieldDefinitionHandle)MetadataTokens.Handle((int)token);
FieldDefinition fieldDef = mdReader.GetFieldDefinition(fieldHandle);

uint offset = ((IRuntimeTypeSystem)this).GetFieldDescOffset(fieldDescPointer, fieldDef);
bool isRVA = ((IRuntimeTypeSystem)this).IsFieldDescRVA(fieldDescPointer);
TargetPointer handleAddr = GetStaticAddressHandle(@base, offset, isRVA, fieldDescPointer, moduleHandle);
if (unboxValueTypes && type == CorElementType.ValueType && !isRVA)
{
Expand Down