PR feedback

src/Compilers/CSharp/Portable/Binder/Binder_Expressions.cs

@@ -9259,8 +9259,8 @@ private BoundExpression BindIndexerOrIndexedPropertyAccess(
             bool allowRefOmittedArguments = !InParameterDefaultValue && !InAttributeArgument && receiver.IsExpressionOfComImportType();
             CompoundUseSiteInfo<AssemblySymbol> useSiteInfo = GetNewCompoundUseSiteInfo(diagnostics);
             this.OverloadResolution.PropertyOverloadResolution(propertyGroup, receiver, analyzedArguments, overloadResolutionResult,
-                options: (allowRefOmittedArguments ? OverloadResolution.Options.AllowRefOmittedArguments : OverloadResolution.Options.None) |
-                         (analyzedArguments.HasDynamicArgument ? OverloadResolution.Options.DynamicResolution : OverloadResolution.Options.None),
+                allowRefOmittedArguments: allowRefOmittedArguments,
+                dynamicResolution: analyzedArguments.HasDynamicArgument,
                 ref useSiteInfo);
             diagnostics.Add(syntax, useSiteInfo);
 

src/Compilers/CSharp/Portable/Binder/Semantics/OverloadResolution/OverloadResolution.cs

@@ -162,18 +162,18 @@ public void PropertyOverloadResolution(
             BoundExpression receiverOpt,
             AnalyzedArguments arguments,
             OverloadResolutionResult<PropertySymbol> result,
-            Options options,
+            bool allowRefOmittedArguments,
+            bool dynamicResolution,
             ref CompoundUseSiteInfo<AssemblySymbol> useSiteInfo)
         {
-            Debug.Assert((options & Options.DynamicResolution) == 0 || arguments.HasDynamicArgument);
-
-            options &= (Options.AllowRefOmittedArguments | Options.DynamicResolution);
+            Debug.Assert(!dynamicResolution || arguments.HasDynamicArgument);
 
             ArrayBuilder<TypeWithAnnotations> typeArguments = ArrayBuilder<TypeWithAnnotations>.GetInstance();
             MethodOrPropertyOverloadResolution(
                 indexers, typeArguments, receiverOpt, arguments, result,
                 useSiteInfo: ref useSiteInfo,
-                options,
+                options: (allowRefOmittedArguments ? Options.AllowRefOmittedArguments : Options.None) |
+                         (dynamicResolution ? Options.DynamicResolution : Options.None),
                 callingConventionInfo: default);
             typeArguments.Free();
         }

src/Compilers/CSharp/Portable/CSharpResources.resx

@@ -7843,7 +7843,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
     <value>The type arguments for method '{0}' cannot be inferred from the usage because an argument with dynamic type is used and the method has a non-array params collection parameter. Try specifying the type arguments explicitly.</value>
   </data>
   <data name="ERR_ParamsCollectionAmbiguousDynamicArgument" xml:space="preserve">
-    <value>Ambiguity between expanded and normal forms of non-array params collection parameter of '{0}', the only corresponding argument has dynamic type. Consider casting the dynamic argument.</value>
+    <value>Ambiguity between expanded and normal forms of non-array params collection parameter of '{0}', the only corresponding argument has the type 'dynamic'. Consider casting the dynamic argument.</value>
   </data>
   <data name="WRN_DynamicDispatchToParamsCollectionMethod" xml:space="preserve">
     <value>One or more overloads of method '{0}' having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
@@ -7852,15 +7852,15 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
     <value>One or more overloads of method having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
   </data>
   <data name="WRN_DynamicDispatchToParamsCollectionIndexer" xml:space="preserve">
-    <value>One or more overloads of indexer having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
+    <value>One or more indexer overloads having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
   </data>
   <data name="WRN_DynamicDispatchToParamsCollectionIndexer_Title" xml:space="preserve">
-    <value>One or more overloads of indexer having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
+    <value>One or more indexer overloads having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
   </data>
   <data name="WRN_DynamicDispatchToParamsCollectionConstructor" xml:space="preserve">
-    <value>One or more overloads of constructor having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
+    <value>One or more constructor overloads having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
   </data>
   <data name="WRN_DynamicDispatchToParamsCollectionConstructor_Title" xml:space="preserve">
-    <value>One or more overloads of constructor having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
+    <value>One or more constructor overloads having non-array params collection parameter might be applicable only in expanded form which is not supported during dynamic dispatch.</value>
   </data>
 </root>