Skip to content

Ensure Array.CreateInstance over reference types works #100626

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
MichalStrehovsky merged 1 commit into from
Apr 5, 2024
Merged

Ensure Array.CreateInstance over reference types works #100626

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/ReflectionMethodBodyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,19 @@ public static bool HandleCall(
}
break;

//
// System.Array
//
// CreateInstance (Type, Int32)
//
case IntrinsicId.Array_CreateInstance:
{
// We could try to analyze if the type is known, but for now making sure this works for canonical arrays is enough.
TypeDesc canonArrayType = reflectionMarker.Factory.TypeSystemContext.CanonType.MakeArrayType();
reflectionMarker.Dependencies.Add(reflectionMarker.Factory.NativeLayout.TemplateTypeLayout(canonArrayType), "Array.CreateInstance was called");
goto case IntrinsicId.None;
}

//
// System.Enum
//
Expand Down
4 changes: 4 additions & 0 deletions src/tools/illink/src/ILLink.Shared/TrimAnalysis/IntrinsicId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ internal enum IntrinsicId
// the reflection body scanner.
RequiresReflectionBodyScanner_Sentinel = 1000,
/// <summary>
/// <see cref="System.Array.CreateInstance(System.Type, int)"/>
/// </summary>
Array_CreateInstance,
/// <summary>
/// <see cref="System.Type.MakeGenericType(System.Type[])"/>
/// </summary>
Type_MakeGenericType,
Expand Down
6 changes: 6 additions & 0 deletions src/tools/illink/src/ILLink.Shared/TrimAnalysis/Intrinsics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ public static IntrinsicId GetIntrinsicIdForMethod (MethodProxy calledMethod)
"Empty" when calledMethod.IsDeclaredOnType ("System.Array")
=> IntrinsicId.Array_Empty,

// static System.Array.CreateInstance (System.Type type, int length)
"CreateInstance" when calledMethod.IsDeclaredOnType ("System.Array")
&& calledMethod.HasMetadataParametersCount (2)
&& calledMethod.HasParameterOfType ((ParameterIndex) 1, "System.Int32")
=> IntrinsicId.Array_CreateInstance,

// static System.Activator.CreateInstance (System.Type type)
// static System.Activator.CreateInstance (System.Type type, bool nonPublic)
// static System.Activator.CreateInstance (System.Type type, params object?[]? args)
Expand Down
1 change: 1 addition & 0 deletions src/tools/illink/src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ public static bool HandleCall (
}
break;

case IntrinsicId.Array_CreateInstance:
case IntrinsicId.Enum_GetValues:
case IntrinsicId.Marshal_SizeOf:
case IntrinsicId.Marshal_OffsetOf:
Expand Down