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

Revert "Reduce work in ConversionsBase.AddUserDefinedConversionsToExplicitCandidateSet" #77163

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert "Reduce work in ConversionsBase.AddUserDefinedConversionsToExplicitCandidateSet" #77163

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
26 changes: 14 additions & 12 deletions src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/UserDefinedExplicitConversions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,28 +222,29 @@ private void AddUserDefinedConversionsToExplicitCandidateSet(
isExplicit ? (isChecked ? WellKnownMemberNames.CheckedExplicitConversionName : WellKnownMemberNames.ExplicitConversionName) : WellKnownMemberNames.ImplicitConversionName,
operators);

var candidates = ArrayBuilder<MethodSymbol>.GetInstance(operators.Count);
candidates.AddRange(operators);

if (isExplicit && isChecked)
{
var operators2 = ArrayBuilder<MethodSymbol>.GetInstance();
declaringType.AddOperators(WellKnownMemberNames.ExplicitConversionName, operators2);

// Add regular operators as well.
if (operators.IsEmpty)
{
declaringType.AddOperators(WellKnownMemberNames.ExplicitConversionName, operators);
candidates.AddRange(operators2);
}
else
{
var originalOperatorCount = operators.Count;

var operators2 = ArrayBuilder<MethodSymbol>.GetInstance();
declaringType.AddOperators(WellKnownMemberNames.ExplicitConversionName, operators2);

foreach (MethodSymbol op2 in operators2)
{
// Drop operators that have a match among the checked ones.
bool add = true;

for (var i = 0; i < originalOperatorCount; i++)
foreach (MethodSymbol op in operators)
{
if (SourceMemberContainerTypeSymbol.DoOperatorsPair(operators[i], op2))
if (SourceMemberContainerTypeSymbol.DoOperatorsPair(op, op2))
{
add = false;
break;
Expand All @@ -252,15 +253,15 @@ private void AddUserDefinedConversionsToExplicitCandidateSet(

if (add)
{
operators.Add(op2);
candidates.Add(op2);
}
}

operators2.Free();
}

operators2.Free();
}

foreach (MethodSymbol op in operators)
foreach (MethodSymbol op in candidates)
{
// We might have a bad operator and be in an error recovery situation. Ignore it.
if (op.ReturnsVoid || op.ParameterCount != 1 || op.ReturnType.TypeKind == TypeKind.Error)
Expand Down Expand Up @@ -364,6 +365,7 @@ private void AddUserDefinedConversionsToExplicitCandidateSet(
}

operators.Free();
candidates.Free();
}

private TypeSymbol MostSpecificSourceTypeForExplicitUserDefinedConversion(
Expand Down