Skip to content

[release/8.0] Fix type parameter mapping logic in ILLink/ILCompiler #92139

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
merged 4 commits into from
Sep 16, 2023
Merged

[release/8.0] Fix type parameter mapping logic in ILLink/ILCompiler #92139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1892957
Fix type parameter mapping bug in illink
sbomer Sep 14, 2023
9d1ff41
Same in ILCompiler
sbomer Sep 14, 2023
6e2b210
Check dataflow of mapped type parameter
sbomer Sep 14, 2023
0f95104
Fix test for analyzer
sbomer Sep 14, 2023
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
3 changes: 3 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/CompilerGeneratedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@ referencedMethod.OwningType is MetadataType generatedType &&
break;

case ILOpcode.stsfld:
case ILOpcode.ldsfld:
{
// Same as above, but stsfld instead of a call to the constructor
// Ldsfld may also trigger a cctor that creates a closure environment
FieldDesc? field = methodBody.GetObject(reader.ReadILToken()) as FieldDesc;
if (field == null)
continue;
Expand Down Expand Up @@ -417,6 +419,7 @@ void MapGeneratedTypeTypeParameters(
break;

case ILOpcode.stsfld:
case ILOpcode.ldsfld:
{
if (body.GetObject(reader.ReadILToken()) is FieldDesc { OwningType: MetadataType owningType }
&& compilerGeneratedType == owningType.GetTypeDefinition())
Expand Down
6 changes: 4 additions & 2 deletions src/tools/illink/src/linker/Linker.Dataflow/CompilerGeneratedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ referencedMethod.DeclaringType is var generatedType &&

case OperandType.InlineField: {
// Same as above, but stsfld instead of a call to the constructor
if (instruction.OpCode.Code is not Code.Stsfld)
// Ldsfld may also trigger a cctor that creates a closure environment
if (instruction.OpCode.Code is not (Code.Stsfld or Code.Ldsfld))
continue;

FieldDefinition? field = _context.TryResolve ((FieldReference) instruction.Operand);
Expand Down Expand Up @@ -390,7 +391,8 @@ static void MapGeneratedTypeTypeParameters (
handled = true;
}
break;
case Code.Stsfld: {
case Code.Stsfld:
case Code.Ldsfld: {
if (instr.Operand is FieldReference { DeclaringType: GenericInstanceType typeRef }
&& compilerGeneratedType == context.TryResolve (typeRef)) {
return typeRef;
Expand Down
17 changes: 17 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/CompilerGeneratedTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static void Main ()
CapturingLocalFunctionInsideIterator<int> ();
LambdaInsideAsync<int> ();
LocalFunctionInsideAsync<int> ();
NestedStaticLambda.Test<int> ();
}

private static void UseIterator ()
Expand Down Expand Up @@ -352,5 +353,21 @@ void LocalFunction ()
await Task.Delay (0);
LocalFunction ();
}

class NestedStaticLambda
{
public static class Container<[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)] T> {
public static Func<Func<T, T>, Func<T, T>> NestedLambda =
(Func<T, T> x) => v => x(v);
}

[ExpectedWarning ("IL2091", "T", nameof (Container<T>), nameof (DynamicallyAccessedMemberTypes.PublicMethods),
// https://github.com/dotnet/runtime/issues/84918
ProducedBy = Tool.Trimmer | Tool.NativeAot)]
public static void Test<T> ()
{
Container<T>.NestedLambda ((T t) => t) (default (T));
}
}
}
}