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

Jump to bottom

Don't track current field of state machines #74111

Merged
merged 1 commit into from
Aug 19, 2022
+47 −8
Merged

Don't track current field of state machines #74111

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/CompilerGeneratedNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,19 @@ internal static bool IsStateMachineType(string typeName)
return typeName.Length > i + 1 && typeName[i + 1] == 'd';
}

internal static bool IsStateMachineCurrentField(string fieldName)
{
if (!IsGeneratedMemberName(fieldName))
return false;

int i = fieldName.LastIndexOf('>');
if (i == -1)
return false;

// Current field is <>2__current
return fieldName.Length > i + 1 && fieldName[i + 1] == '2';
}

internal static bool IsGeneratedType(string name) => IsStateMachineType(name) || IsLambdaDisplayClass(name);

internal static bool IsLambdaOrLocalFunction(string methodName) => IsLambdaMethod(methodName) || IsLocalFunction(methodName);
Expand Down
15 changes: 11 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 @@ -500,10 +500,17 @@ static IEnumerable<MetadataType> GetCompilerGeneratedNestedTypes(MetadataType ty

public static bool IsHoistedLocal(FieldDesc field)
{
// Treat all fields on compiler-generated types as hoisted locals.
// This avoids depending on the name mangling scheme for hoisted locals.
var declaringTypeName = field.OwningType.Name;
return CompilerGeneratedNames.IsLambdaDisplayClass(declaringTypeName) || CompilerGeneratedNames.IsStateMachineType(declaringTypeName);
if (CompilerGeneratedNames.IsLambdaDisplayClass(field.OwningType.Name))
return true;

if (CompilerGeneratedNames.IsStateMachineType(field.OwningType.Name))
{
// Don't track the "current" field which is used for state machine return values,
// because this can be expensive to track.
return !CompilerGeneratedNames.IsStateMachineCurrentField(field.Name);
}

return false;
}

// "Nested function" refers to lambdas and local functions.
Expand Down
13 changes: 13 additions & 0 deletions ...tools/aot/ILCompiler.Compiler/Compiler/Dataflow/ReferenceSource/CompilerGeneratedNames.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ internal static bool IsStateMachineType (string typeName)
return typeName.Length > i + 1 && typeName[i + 1] == 'd';
}

internal static bool IsStateMachineCurrentField (string fieldName)
{
if (!IsGeneratedMemberName (fieldName))
return false;

int i = fieldName.LastIndexOf ('>');
if (i == -1)
return false;

// Current field is <>2__current
return fieldName.Length > i + 1 && fieldName[i + 1] == '2';
}

internal static bool IsGeneratedType (string name) => IsStateMachineType (name) || IsLambdaDisplayClass (name);

internal static bool IsLambdaOrLocalFunction (string methodName) => IsLambdaMethod (methodName) || IsLocalFunction (methodName);
Expand Down
14 changes: 10 additions & 4 deletions ...tools/aot/ILCompiler.Compiler/Compiler/Dataflow/ReferenceSource/CompilerGeneratedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,16 @@ static IEnumerable<TypeDefinition> GetCompilerGeneratedNestedTypes (TypeDefiniti

public static bool IsHoistedLocal (FieldDefinition field)
{
// Treat all fields on compiler-generated types as hoisted locals.
// This avoids depending on the name mangling scheme for hoisted locals.
var declaringTypeName = field.DeclaringType.Name;
return CompilerGeneratedNames.IsLambdaDisplayClass (declaringTypeName) || CompilerGeneratedNames.IsStateMachineType (declaringTypeName);
if (CompilerGeneratedNames.IsLambdaDisplayClass (field.DeclaringType.Name))
return true;

if (CompilerGeneratedNames.IsStateMachineType (field.DeclaringType.Name)) {
// Don't track the "current" field which is used for state machine return values,
// because this can be expensive to track.
return !CompilerGeneratedNames.IsStateMachineCurrentField (field.Name);
}

return false;
}

// "Nested function" refers to lambdas and local functions.
Expand Down