Skip to content
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

Delete parts of type system that deal with layouts #79366

Merged
merged 3 commits into from
Dec 8, 2022
Merged

Delete parts of type system that deal with layouts #79366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28033a2
Delete parts of type system that deal with layouts
MichalStrehovsky Dec 7, 2022
4fe7ce6
Just copy the rest of rare flags from the template
MichalStrehovsky Dec 8, 2022
6f8326d
Update EETypeCreator.cs
MichalStrehovsky Dec 8, 2022
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
116 changes: 17 additions & 99 deletions ...eclr/nativeaot/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/EETypeCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
pTemplateEEType = pTemplateEEType->DynamicTemplateType;
}

uint valueTypeFieldPaddingEncoded = 0;
int baseSize = 0;

bool isValueType;
Expand All @@ -171,68 +170,32 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
bool isGeneric;
uint flags;
ushort runtimeInterfacesLength = 0;
bool isAbstractClass;
bool isByRefLike;
IntPtr typeManager = IntPtr.Zero;

if (state.RuntimeInterfaces != null)
{
runtimeInterfacesLength = checked((ushort)state.RuntimeInterfaces.Length);
}

valueTypeFieldPaddingEncoded = EETypeBuilderHelpers.ComputeValueTypeFieldPaddingFieldValue(
pTemplateEEType->ValueTypeFieldPadding,
(uint)pTemplateEEType->FieldAlignmentRequirement,
IntPtr.Size);
baseSize = (int)pTemplateEEType->BaseSize;
isValueType = pTemplateEEType->IsValueType;
hasFinalizer = pTemplateEEType->IsFinalizable;
isNullable = pTemplateEEType->IsNullable;
flags = pTemplateEEType->Flags;
isArray = pTemplateEEType->IsArray;
isGeneric = pTemplateEEType->IsGeneric;
isAbstractClass = pTemplateEEType->IsAbstract && !pTemplateEEType->IsInterface;
isByRefLike = pTemplateEEType->IsByRefLike;
typeManager = pTemplateEEType->PointerToTypeManager;
Debug.Assert(pTemplateEEType->NumInterfaces == runtimeInterfacesLength);

flags |= (uint)EETypeFlags.IsDynamicTypeFlag;

// TODO! Change to if template is Universal or non-Existent

// FEATURE_UNIVERSAL_GENERICS?
if (state.TypeSize.HasValue)
if (state.TypeBeingBuilt.IsMdArray)
{
baseSize = state.TypeSize.Value;

int baseSizeBeforeAlignment = baseSize;

baseSize = MemoryHelpers.AlignUp(baseSize, IntPtr.Size);

if (isValueType)
{
// Compute the valuetype padding size based on size before adding the object type pointer field to the size
uint cbValueTypeFieldPadding = (uint)(baseSize - baseSizeBeforeAlignment);

// Add Object type pointer field to base size
baseSize += IntPtr.Size;

valueTypeFieldPaddingEncoded = (uint)EETypeBuilderHelpers.ComputeValueTypeFieldPaddingFieldValue(cbValueTypeFieldPadding, (uint)state.FieldAlignment.Value, IntPtr.Size);
}

// Minimum base size is 3 pointers, and requires us to bump the size of an empty class type
if (baseSize <= IntPtr.Size)
{
// ValueTypes should already have had their size bumped up by the normal type layout process
Debug.Assert(!isValueType);
baseSize += IntPtr.Size;
}

// Add sync block skew
baseSize += IntPtr.Size;

// Minimum basesize is 3 pointers
Debug.Assert(baseSize >= (IntPtr.Size * 3));
// If we're building an MDArray, the template is object[,] and we
// need to recompute the base size.
baseSize = IntPtr.Size + // sync block
2 * IntPtr.Size + // EETypePtr + Length
state.ArrayRank.Value * sizeof(int) * 2; // 2 ints per rank for bounds
}

// Optional fields encoding
Expand All @@ -241,7 +204,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo

uint rareFlags = optionalFields.GetFieldValue(EETypeOptionalFieldTag.RareFlags, 0);

if (state.NonGcDataSize != 0)
int allocatedNonGCDataSize = state.NonGcDataSize;
if (state.HasStaticConstructor)
allocatedNonGCDataSize += -TypeBuilder.ClassConstructorOffset;

if (allocatedNonGCDataSize != 0)
rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithNonGcStatics;

if (state.GcDataSize != 0)
Expand All @@ -250,60 +217,11 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
if (state.ThreadDataSize != 0)
rareFlags |= (uint)EETypeRareFlags.IsDynamicTypeWithThreadStatics;

#if TARGET_ARM
if (state.FieldAlignment == 8)
rareFlags |= (uint)EETypeRareFlags.RequiresAlign8Flag;
else
rareFlags &= ~(uint)EETypeRareFlags.RequiresAlign8Flag;
#endif

#if TARGET_ARM || TARGET_ARM64
if (state.IsHFA)
rareFlags |= (uint)EETypeRareFlags.IsHFAFlag;
else
rareFlags &= ~(uint)EETypeRareFlags.IsHFAFlag;
#endif
if (state.HasStaticConstructor)
rareFlags |= (uint)EETypeRareFlags.HasCctorFlag;
else
rareFlags &= ~(uint)EETypeRareFlags.HasCctorFlag;

if (isAbstractClass)
rareFlags |= (uint)EETypeRareFlags.IsAbstractClassFlag;
else
rareFlags &= ~(uint)EETypeRareFlags.IsAbstractClassFlag;

if (isByRefLike)
rareFlags |= (uint)EETypeRareFlags.IsByRefLikeFlag;
else
rareFlags &= ~(uint)EETypeRareFlags.IsByRefLikeFlag;

if (isNullable)
{
uint nullableValueOffset = state.NullableValueOffset;

// The stored offset is never zero (Nullable has a boolean there indicating whether the value is valid).
// If the real offset is one, then the field isn't set. Otherwise the offset is encoded - 1 to save space.
if (nullableValueOffset == 1)
optionalFields.ClearField(EETypeOptionalFieldTag.NullableValueOffset);
else
optionalFields.SetFieldValue(EETypeOptionalFieldTag.NullableValueOffset, checked(nullableValueOffset - 1));
}
else
{
optionalFields.ClearField(EETypeOptionalFieldTag.NullableValueOffset);
}

optionalFields.SetFieldValue(EETypeOptionalFieldTag.RareFlags, rareFlags);

// Dispatch map is fetched from template type
optionalFields.ClearField(EETypeOptionalFieldTag.DispatchMap);

optionalFields.ClearField(EETypeOptionalFieldTag.ValueTypeFieldPadding);

if (valueTypeFieldPaddingEncoded != 0)
optionalFields.SetFieldValue(EETypeOptionalFieldTag.ValueTypeFieldPadding, valueTypeFieldPaddingEncoded);

// Compute size of optional fields encoding
cbOptionalFieldsSize = optionalFields.Encode();
Debug.Assert(cbOptionalFieldsSize > 0);
Expand All @@ -328,7 +246,7 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
true,
(rareFlags & (int)EETypeRareFlags.HasSealedVTableEntriesFlag) != 0,
isGeneric,
state.NonGcDataSize != 0,
allocatedNonGCDataSize != 0,
state.GcDataSize != 0,
state.ThreadDataSize != 0);

Expand Down Expand Up @@ -401,19 +319,19 @@ private static void CreateEETypeWorker(MethodTable* pTemplateEEType, uint hashCo
nonGCStaticDataOffset = state.HasStaticConstructor ? -TypeBuilder.ClassConstructorOffset : 0;

// If we have a class constructor, our NonGcDataSize MUST be non-zero
Debug.Assert(!state.HasStaticConstructor || (state.NonGcDataSize != 0));
Debug.Assert(!state.HasStaticConstructor || (allocatedNonGCDataSize != 0));
}

if (isGeneric)
{
genericComposition = MemoryHelpers.AllocateMemory(MethodTable.GetGenericCompositionSize(arity, pEEType->HasGenericVariance));
pEEType->SetGenericComposition(genericComposition);

if (state.NonGcDataSize > 0)
if (allocatedNonGCDataSize > 0)
{
nonGcStaticData = MemoryHelpers.AllocateMemory(state.NonGcDataSize);
MemoryHelpers.Memset(nonGcStaticData, state.NonGcDataSize, 0);
Debug.Assert(nonGCStaticDataOffset <= state.NonGcDataSize);
nonGcStaticData = MemoryHelpers.AllocateMemory(allocatedNonGCDataSize);
MemoryHelpers.Memset(nonGcStaticData, allocatedNonGCDataSize, 0);
Debug.Assert(nonGCStaticDataOffset <= allocatedNonGCDataSize);
pEEType->DynamicNonGcStaticsData = (IntPtr)((byte*)nonGcStaticData + nonGCStaticDataOffset);
}
}
Expand Down
124 changes: 0 additions & 124 deletions ...t/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/NativeLayoutFieldAlgorithm.cs
View file
Open in desktop

This file was deleted.

Loading