Fix overload resolution regression around params parameters (#73373)

Fixes #73346.
dotnet · May 9, 2024 · c23414e · c23414e
1 parent a9559f6
commit c23414e
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 59 deletions.
diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs
@@ -10627,7 +10627,7 @@ bool satisfiesConstraintChecks(MethodSymbol method)
                 parameters.SelectAsArray(p => p.ExplicitDefaultConstantValue) :
                 default;
 
-            var hasParams = OverloadResolution.IsValidParams(this, methodSymbol);
+            var hasParams = OverloadResolution.IsValidParams(this, methodSymbol, out _);
 
             Debug.Assert(ContainingMemberOrLambda is { });
             Debug.Assert(parameterRefKinds.IsDefault || parameterRefKinds.Length == parameterTypes.Length);

diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Invocation.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Invocation.cs
@@ -882,7 +882,7 @@ private void ReportDynamicInvocationWarnings(SyntaxNode syntax, BoundMethodGroup
         private bool IsAmbiguousDynamicParamsArgument<TMethodOrPropertySymbol>(ArrayBuilder<BoundExpression> arguments, MemberResolutionResult<TMethodOrPropertySymbol> candidate, out SyntaxNode argumentSyntax)
              where TMethodOrPropertySymbol : Symbol
         {
-            if (OverloadResolution.IsValidParams(this, candidate.LeastOverriddenMember) &&
+            if (OverloadResolution.IsValidParams(this, candidate.LeastOverriddenMember, out _) &&
                 candidate.Result.Kind == MemberResolutionKind.ApplicableInNormalForm)
             {
                 var parameters = candidate.Member.GetParameters();

diff --git a/src/Compilers/CSharp/Portable/Binder/Semantics/OverloadResolution/MemberAnalysisResult.cs b/src/Compilers/CSharp/Portable/Binder/Semantics/OverloadResolution/MemberAnalysisResult.cs
@@ -105,6 +105,7 @@ private init
 
         public readonly int BadParameter;
         public readonly MemberResolutionKind Kind;
+        public readonly TypeWithAnnotations DefinitionParamsElementTypeOpt;
         public readonly TypeWithAnnotations ParamsElementTypeOpt;
 
         /// <summary>
@@ -121,11 +122,14 @@ private MemberAnalysisResult(
             int missingParameter = -1,
             bool hasAnyRefOmittedArgument = false,
             ImmutableArray<TypeParameterDiagnosticInfo> constraintFailureDiagnosticsOpt = default,
+            TypeWithAnnotations definitionParamsElementTypeOpt = default,
             TypeWithAnnotations paramsElementTypeOpt = default)
         {
+            Debug.Assert(kind != MemberResolutionKind.ApplicableInExpandedForm || definitionParamsElementTypeOpt.HasType);
             Debug.Assert(kind != MemberResolutionKind.ApplicableInExpandedForm || paramsElementTypeOpt.HasType);
 
             this.Kind = kind;
+            this.DefinitionParamsElementTypeOpt = definitionParamsElementTypeOpt;
             this.ParamsElementTypeOpt = paramsElementTypeOpt;
             this.BadArgumentsOpt = badArgumentsOpt;
             this.ArgsToParamsOpt = argsToParamsOpt;
@@ -314,7 +318,7 @@ public static MemberAnalysisResult UnsupportedMetadata()
             return new MemberAnalysisResult(MemberResolutionKind.UnsupportedMetadata);
         }
 
-        public static MemberAnalysisResult BadArgumentConversions(ImmutableArray<int> argsToParamsOpt, BitVector badArguments, ImmutableArray<Conversion> conversions, TypeWithAnnotations paramsElementTypeOpt)
+        public static MemberAnalysisResult BadArgumentConversions(ImmutableArray<int> argsToParamsOpt, BitVector badArguments, ImmutableArray<Conversion> conversions, TypeWithAnnotations definitionParamsElementTypeOpt, TypeWithAnnotations paramsElementTypeOpt)
         {
             Debug.Assert(conversions.Length != 0);
             Debug.Assert(badArguments.TrueBits().Any());
@@ -323,6 +327,7 @@ public static MemberAnalysisResult BadArgumentConversions(ImmutableArray<int> ar
                 badArguments,
                 argsToParamsOpt,
                 conversions,
+                definitionParamsElementTypeOpt: definitionParamsElementTypeOpt,
                 paramsElementTypeOpt: paramsElementTypeOpt);
         }
 
@@ -373,9 +378,11 @@ public static MemberAnalysisResult NormalForm(ImmutableArray<int> argsToParamsOp
             return new MemberAnalysisResult(MemberResolutionKind.ApplicableInNormalForm, BitVector.Null, argsToParamsOpt, conversions, hasAnyRefOmittedArgument: hasAnyRefOmittedArgument);
         }
 
-        public static MemberAnalysisResult ExpandedForm(ImmutableArray<int> argsToParamsOpt, ImmutableArray<Conversion> conversions, bool hasAnyRefOmittedArgument, TypeWithAnnotations paramsElementType)
+        public static MemberAnalysisResult ExpandedForm(ImmutableArray<int> argsToParamsOpt, ImmutableArray<Conversion> conversions, bool hasAnyRefOmittedArgument, TypeWithAnnotations definitionParamsElementType, TypeWithAnnotations paramsElementType)
         {
-            return new MemberAnalysisResult(MemberResolutionKind.ApplicableInExpandedForm, BitVector.Null, argsToParamsOpt, conversions, hasAnyRefOmittedArgument: hasAnyRefOmittedArgument, paramsElementTypeOpt: paramsElementType);
+            return new MemberAnalysisResult(
+                MemberResolutionKind.ApplicableInExpandedForm, BitVector.Null, argsToParamsOpt, conversions,
+                hasAnyRefOmittedArgument: hasAnyRefOmittedArgument, definitionParamsElementTypeOpt: definitionParamsElementType, paramsElementTypeOpt: paramsElementType);
         }
 
         public static MemberAnalysisResult Worse()