Skip to content

Fix type parameter mapping for static closures #118607

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 1 commit into from
Aug 13, 2025
Merged

Fix type parameter mapping for static closures #118607

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
24 changes: 20 additions & 4 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 @@ -175,8 +175,8 @@ void ProcessMethod(MethodDesc method)
// Find calls to state machine constructors that occur outside the type
if (referencedMethod.IsConstructor &&
referencedMethod.OwningType is MetadataType generatedType &&
// Don't consider calls in the same type, like inside a static constructor
method.OwningType != generatedType &&
// Don't consider calls in the same/nested type, like inside a static constructor
!IsSameOrNestedType(method.OwningType, generatedType) &&
CompilerGeneratedNames.IsLambdaDisplayClass(generatedType.Name))
{
Debug.Assert(generatedType.IsTypeDefinition);
Expand Down Expand Up @@ -216,8 +216,8 @@ referencedMethod.OwningType is MetadataType generatedType &&
field = field.GetTypicalFieldDefinition();

if (field.OwningType is MetadataType generatedType &&
// Don't consider field accesses in the same type, like inside a static constructor
method.OwningType != generatedType &&
// Don't consider field accesses in the same/nested type, like inside a static constructor
!IsSameOrNestedType(method.OwningType, generatedType) &&
CompilerGeneratedNames.IsLambdaDisplayClass(generatedType.Name))
{
Debug.Assert(generatedType.IsTypeDefinition);
Expand Down Expand Up @@ -259,6 +259,22 @@ referencedMethod.OwningType is MetadataType generatedType &&
// Fill in null for argument providers now, the real providers will be filled in later
generatedTypeToTypeArgs[stateMachineType] = new TypeArgumentInfo(method, null);
}

static bool IsSameOrNestedType(TypeDesc type, TypeDesc potentialOuterType)
{
do
{
if (type == potentialOuterType)
return true;

if (type is not EcmaType ecmaType)
return false;

type = ecmaType.ContainingType;
} while (type != null);

return false;
}
}

// Look for state machine methods, and methods which call local functions.
Expand Down
21 changes: 17 additions & 4 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,8 +180,8 @@ void ProcessMethod(MethodDefinition method)
// Find calls to state machine constructors that occur outside the type
if (referencedMethod.IsConstructor &&
referencedMethod.DeclaringType is var generatedType &&
// Don't consider calls in the same type, like inside a static constructor
method.DeclaringType != generatedType &&
// Don't consider calls in the same/nested type, like inside a static constructor
!IsSameOrNestedType(method.DeclaringType, generatedType) &&
CompilerGeneratedNames.IsLambdaDisplayClass(generatedType.Name))
{
// fill in null for now, attribute providers will be filled in later
Expand Down Expand Up @@ -219,8 +219,8 @@ referencedMethod.DeclaringType is var generatedType &&
continue;

if (field.DeclaringType is var generatedType &&
// Don't consider field accesses in the same type, like inside a static constructor
method.DeclaringType != generatedType &&
// Don't consider field accesses in the same/nested type, like inside a static constructor
!IsSameOrNestedType(method.DeclaringType, generatedType) &&
CompilerGeneratedNames.IsLambdaDisplayClass(generatedType.Name))
{
if (!generatedTypeToTypeArgs.TryAdd(generatedType, new TypeArgumentInfo(method, null)))
Expand Down Expand Up @@ -253,6 +253,19 @@ referencedMethod.DeclaringType is var generatedType &&
// Fill in null for argument providers now, the real providers will be filled in later
generatedTypeToTypeArgs[stateMachineType] = new TypeArgumentInfo(method, null);
}

static bool IsSameOrNestedType(TypeDefinition type, TypeDefinition potentialOuterType)
{
do
{
if (type == potentialOuterType)
return true;

type = type.DeclaringType;
} while (type != null);

return false;
}
}

// Look for state machine methods, and methods which call local functions.
Expand Down
46 changes: 46 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 @@ -48,6 +48,8 @@ public static void Main()
CapturingLocalFunctionInsideIterator<int>();
LambdaInsideAsync<int>();
LocalFunctionInsideAsync<int>();
NestedAsyncLambda.Test<int>();
NestedAsyncLocalFunction.Test<int>();
NestedStaticLambda.Test<int>();
}

Expand Down Expand Up @@ -423,6 +425,50 @@ void LocalFunction()
LocalFunction();
}

class NestedAsyncLambda
{
public static async void Test<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>()
{
var outer = async () =>
{
var inner =
[ExpectedWarning("IL2090", "T", nameof(DynamicallyAccessedMemberTypes.PublicProperties))]
() =>
{
_ = typeof(T).GetMethods();
_ = typeof(T).GetProperties();
};

inner();
};

outer().Wait();
}
}

class NestedAsyncLocalFunction
{
public static void Test<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>()
{
Local1();

#if INCLUDE_UNEXPECTED_LOWERING_WARNINGS
[UnexpectedWarning("IL2091", "T", nameof(DynamicallyAccessedMemberTypes.PublicMethods), Tool.Trimmer | Tool.NativeAot, "https://github.com/dotnet/roslyn/issues/79333", CompilerGeneratedCode = true)]
#endif
static async Task Local1()
{
Local2();

[ExpectedWarning("IL2090", "T", nameof(DynamicallyAccessedMemberTypes.PublicProperties))]
static void Local2()
{
_ = typeof(T).GetMethods();
_ = typeof(T).GetProperties();
};
};
}
}

class NestedStaticLambda
{
public static class Container<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] T>
Expand Down
Loading