Skip to content

Resolve field offsets through byref bases in ResolveFieldOffsets #613

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

Open
shadesbelow wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Resolve field offsets through byref bases in ResolveFieldOffsets #613

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
10 changes: 8 additions & 2 deletions Cpp2IL.Core/Analysis/MetadataResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,15 @@ public static bool ResolveFieldOffsets(MethodAnalysisContext method)
if (memory.Base is not LocalVariable local || local?.Type == null)
continue;

// A byref-typed base (a managed pointer to a value type) has no fields of its
// own - IlGenerator's Ldfld emission accepts a managed pointer operand directly
// (same as it does for the addend==0 dereference case), so field resolution walks
// the referent's layout instead of the byref wrapper's, which is always empty.
var baseType = local.Type is ByRefTypeAnalysisContext { ElementType: { } referent } ? referent : local.Type;

// check if static field access
var staticOwner = (local.Type as StaticFieldStorageTypeAnalysisContext)?.OwnerType;
var owner = staticOwner ?? local.Type;
var staticOwner = (baseType as StaticFieldStorageTypeAnalysisContext)?.OwnerType;
var owner = staticOwner ?? baseType;
var genericOwner = owner as GenericInstanceTypeAnalysisContext;

FieldAnalysisContext? field;
Expand Down