Skip to content

Use indirect field access for types spanning multiple inexact compilation units #129830

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
jtschuster wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

Use indirect field access for types spanning multiple inexact compilation units #129830

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
19 changes: 19 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3095,6 +3095,25 @@ private void EncodeFieldBaseOffset(FieldDesc field, ref CORINFO_RESOLVED_TOKEN p
}
// ENCODE_NONE
}
else if (_compilation.CompilationModuleGroup.TypeLayoutCompilationUnits(pMT).HasMultipleInexactCompilationUnits)
{
PreventRecursiveFieldInlinesOutsideVersionBubble(field, callerMethod);

// The layout of this type spans multiple inexact compilation units (assemblies that version
// with the current compilation but whose grouping into composite images is not fixed at
// compile time). When that is the case the offset of this field relative to its base class is
// unknowable: depending on whether those modules are ultimately bound as a single composite
// image or as individual assemblies, the runtime may either insert alignment before this
// type's fields or back-fill them into the base type's trailing alignment padding. Neither the
// relative ENCODE_FIELD_BASE_OFFSET encoding nor a baked absolute offset (with a relative
// field-offset verification) is valid for both layouts, so fall back to an indirect,
// runtime-resolved field offset, which is correct regardless of how the modules are grouped.

// ENCODE_FIELD_OFFSET
pResult->offset = 0;
pResult->fieldAccessor = CORINFO_FIELD_ACCESSOR.CORINFO_FIELD_INSTANCE_WITH_BASE;
pResult->fieldLookup = CreateConstLookupToSymbol(_compilation.SymbolNodeFactory.FieldOffset(ComputeFieldWithToken(field, ref pResolvedToken)));
}
else if (_compilation.IsInheritanceChainLayoutFixedInCurrentVersionBubble(pMT.BaseType))
{
if (_compilation.SymbolNodeFactory.VerifyTypeAndFieldLayout && !callerMethod.IsNonVersionable() && (pResult->offset <= FieldFixupSignature.MaxCheckableOffset))
Expand Down
Loading