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

Integration of changes in shared files from runtimelab/NativeAOT #62039

Merged
merged 2 commits into from
Nov 25, 2021
Merged

Integration of changes in shared files from runtimelab/NativeAOT #62039

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
efe2eb0
Integration of changes in shared files from runtimelab/NativeAOT
MichalStrehovsky Nov 25, 2021
bbc0545
Update System.Private.CoreLib.Shared.projitems
MichalStrehovsky Nov 25, 2021
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
7 changes: 7 additions & 0 deletions src/coreclr/tools/Common/Compiler/DisplayNameHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ public static string GetDisplayName(this PropertyPseudoDesc property)
.Append('.')
.Append(property.Name).ToString();
}

public static string GetDisplayName(this EventPseudoDesc @event)
{
return new StringBuilder(@event.OwningType.GetDisplayName())
.Append('.')
.Append(@event.Name).ToString();
}
#endif

public static string GetDisplayName(this TypeDesc type)
Expand Down
18 changes: 2 additions & 16 deletions src/coreclr/tools/Common/TypeSystem/Common/MetadataFieldLayoutAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Internal.TypeSystem
/// MetadataFieldLayout algorithm which can be used to compute field layout
/// for any MetadataType where all fields are available by calling GetFields.
/// </summary>
public class MetadataFieldLayoutAlgorithm : FieldLayoutAlgorithm
public abstract class MetadataFieldLayoutAlgorithm : FieldLayoutAlgorithm
{
public override ComputedInstanceFieldLayout ComputeInstanceLayout(DefType defType, InstanceLayoutKind layoutKind)
{
Expand Down Expand Up @@ -167,21 +167,7 @@ out instanceByteSizeAndAlignment
return ComputeInstanceFieldLayout(type, numInstanceFields);
}

protected virtual ComputedInstanceFieldLayout ComputeInstanceFieldLayout(MetadataType type, int numInstanceFields)
{
if (type.IsExplicitLayout)
{
return ComputeExplicitFieldLayout(type, numInstanceFields);
}
else if (type.IsSequentialLayout || type.IsEnum || type.Context.Target.Abi == TargetAbi.CppCodegen)
{
return ComputeSequentialFieldLayout(type, numInstanceFields);
}
else
{
return ComputeAutoFieldLayout(type, numInstanceFields);
}
}
protected abstract ComputedInstanceFieldLayout ComputeInstanceFieldLayout(MetadataType type, int numInstanceFields);

public override ComputedStaticFieldLayout ComputeStaticFieldLayout(DefType defType, StaticLayoutKind layoutKind)
{
Expand Down
16 changes: 16 additions & 0 deletions ...eclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestMetadataFieldLayoutAlgorithm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,21 @@ protected override void FinalizeRuntimeSpecificStaticFieldLayout(TypeSystemConte
layout.ThreadGcStatics.Size = LayoutInt.Zero;
}
}

protected override ComputedInstanceFieldLayout ComputeInstanceFieldLayout(MetadataType type, int numInstanceFields)
{
if (type.IsExplicitLayout)
{
return ComputeExplicitFieldLayout(type, numInstanceFields);
}
else if (type.IsSequentialLayout || type.IsEnum)
{
return ComputeSequentialFieldLayout(type, numInstanceFields);
}
else
{
return ComputeAutoFieldLayout(type, numInstanceFields);
}
}
}
}
8 changes: 4 additions & 4 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Empty.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\EntryPointNotFoundException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Enum.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Enum.EnumInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Enum.EnumInfo.cs" Condition="'$(TargetsCoreRT)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.SpecialFolder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Environment.SpecialFolderOption.cs" />
Expand Down Expand Up @@ -633,9 +633,9 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ReflectionTypeLoadException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ResourceAttributes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ResourceLocation.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeConstructorInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeConstructorInfo.cs" Condition="'$(TargetsCoreRT)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeMethodBody.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeMethodInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeMethodInfo.cs" Condition="'$(TargetsCoreRT)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\RuntimeReflectionExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\SignatureArrayType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Reflection\SignatureByRefType.cs" />
Expand Down Expand Up @@ -1113,7 +1113,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Type.Helpers.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypeAccessException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypeCode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypedReference.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypedReference.cs" Condition="'$(TargetsCoreRT)' != 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypeInitializationException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypeLoadException.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\TypeUnloadedException.cs" />
Expand Down