Merge main to features/list-patterns

docs/Language Feature Status.md

@@ -13,7 +13,6 @@ efforts behind them.
 | [nameof(parameter)](https://github.com/dotnet/csharplang/issues/373) | main | [In Progress](https://github.com/dotnet/roslyn/issues/40524) | [jcouv](https://github.com/jcouv) | TBD | [jcouv](https://github.com/jcouv) |
 | [Relax ordering of `ref` and `partial` modifiers](https://github.com/dotnet/csharplang/issues/946) | [ref-partial](https://github.com/dotnet/roslyn/tree/features/ref-partial) | In Progress | [alrz](https://github.com/alrz) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
 | [Parameter null-checking](https://github.com/dotnet/csharplang/issues/2145) | [param-nullchecking](https://github.com/dotnet/roslyn/tree/features/param-nullchecking) | [In Progress](https://github.com/dotnet/roslyn/issues/36024) | [fayrose](https://github.com/fayrose) | [agocke](https://github.com/agocke) | [jaredpar](https://github.com/jaredpar) |
-| [Caller expression attribute](https://github.com/dotnet/csharplang/issues/287) | [caller-argument-expression](https://github.com/dotnet/roslyn/tree/features/caller-argument-expression) | [In Progress](https://github.com/dotnet/roslyn/issues/52745) | [Youssef1313](https://github.com/Youssef1313) | [333fred](https://github.com/333fred),[AlekseyTs](https://github.com/AlekseyTs) | [jcouv](https://github.com/jcouv) |
 | [Generic attributes](https://github.com/dotnet/csharplang/issues/124) | [generic-attributes](https://github.com/dotnet/roslyn/tree/features/generic-attributes) | [In Progress](https://github.com/dotnet/roslyn/issues/36285) | [AviAvni](https://github.com/AviAvni) | [agocke](https://github.com/agocke) | [mattwar](https://github.com/mattwar) |
 | [Default in deconstruction](https://github.com/dotnet/roslyn/pull/25562) | [decon-default](https://github.com/dotnet/roslyn/tree/features/decon-default) | [Implemented](https://github.com/dotnet/roslyn/issues/25559) | [jcouv](https://github.com/jcouv) | [gafter](https://github.com/gafter) | [jcouv](https://github.com/jcouv) |
 | [List patterns](https://github.com/dotnet/csharplang/issues/3435) | [list-patterns](https://github.com/dotnet/roslyn/tree/features/list-patterns) | [In Progress](https://github.com/dotnet/roslyn/issues/51289) | [alrz](https://github.com/alrz) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [333fred](https://github.com/333fred) |
@@ -38,6 +37,7 @@ efforts behind them.
 | [Interpolated string improvements](https://github.com/dotnet/csharplang/issues/4487) | main | [Merged into 17.0p3](https://github.com/dotnet/roslyn/issues/51499) | [333fred](https://github.com/333fred) | [AlekseyTs](https://github.com/AlekseyTs), [chsienki](https://github.com/chsienki) | [jaredpar](https://github.com/jaredpar) |
 | [File-scoped namespace](https://github.com/dotnet/csharplang/issues/137) | main | [Merged into 17.0p3](https://github.com/dotnet/roslyn/issues/49000) | [RikkiGibson](https://github.com/RikkiGibson) | [jcouv](https://github.com/jcouv), [chsienki](https://github.com/chsienki) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
 | [Parameterless struct constructors](https://github.com/dotnet/csharplang/issues/99) | [struct-ctors](https://github.com/dotnet/roslyn/tree/features/struct-ctors) | [Merged into 17.0p3](https://github.com/dotnet/roslyn/issues/51698) | [cston](https://github.com/cston) | [jcouv](https://github.com/jcouv), [333fred](https://github.com/333fred) | [jcouv](https://github.com/jouv) |
+| [Caller expression attribute](https://github.com/dotnet/csharplang/issues/287) | main | [Merged into 17.0p3](https://github.com/dotnet/roslyn/issues/52745) | [Youssef1313](https://github.com/Youssef1313) | [333fred](https://github.com/333fred),[AlekseyTs](https://github.com/AlekseyTs) | [jcouv](https://github.com/jcouv) |
 
 # VB 16.9
 

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

@@ -241,7 +241,7 @@ private CSharpAttributeData GetAttribute(BoundAttribute boundAttribute, BindingD
             else
             {
                 constructorArguments = GetRewrittenAttributeConstructorArguments(out constructorArgumentsSourceIndices, attributeConstructor,
-                    constructorArgsArray, boundAttribute.ConstructorArgumentNamesOpt, (AttributeSyntax)boundAttribute.Syntax, diagnostics, ref hasErrors);
+                    constructorArgsArray, boundAttribute.ConstructorArgumentNamesOpt, (AttributeSyntax)boundAttribute.Syntax, boundAttribute.ConstructorArgumentsToParamsOpt, diagnostics, ref hasErrors);
             }
 
             CompoundUseSiteInfo<AssemblySymbol> useSiteInfo = GetNewCompoundUseSiteInfo(diagnostics);
@@ -593,6 +593,7 @@ private ImmutableArray<TypedConstant> GetRewrittenAttributeConstructorArguments(
             ImmutableArray<TypedConstant> constructorArgsArray,
             ImmutableArray<string?> constructorArgumentNamesOpt,
             AttributeSyntax syntax,
+            ImmutableArray<int> argumentsToParams,
             BindingDiagnosticBag diagnostics,
             ref bool hasErrors)
         {
@@ -610,9 +611,6 @@ private ImmutableArray<TypedConstant> GetRewrittenAttributeConstructorArguments(
             Debug.Assert(!hasNamedCtorArguments ||
                 constructorArgumentNamesOpt.Length == argumentsCount);
 
-            // index of the first named constructor argument
-            int firstNamedArgIndex = -1;
-
             ImmutableArray<ParameterSymbol> parameters = attributeConstructor.Parameters;
             int parameterCount = parameters.Length;
 
@@ -650,28 +648,20 @@ private ImmutableArray<TypedConstant> GetRewrittenAttributeConstructorArguments(
                     }
                     else
                     {
-                        // named constructor argument
-
-                        // Store the index of the first named constructor argument
-                        if (firstNamedArgIndex == -1)
-                        {
-                            firstNamedArgIndex = argsConsumedCount;
-                        }
-
                         // Current parameter must either have a matching named argument or a default value
                         // For the former case, argsConsumedCount must be incremented to note that we have
                         // consumed a named argument. For the latter case, argsConsumedCount stays same.
                         int matchingArgumentIndex;
-                        reorderedArgument = GetMatchingNamedOrOptionalConstructorArgument(out matchingArgumentIndex, constructorArgsArray,
-                            constructorArgumentNamesOpt, parameter, firstNamedArgIndex, argumentsCount, ref argsConsumedCount, syntax, diagnostics);
+                        reorderedArgument = getMatchingNamedOrOptionalConstructorArgument(out matchingArgumentIndex, constructorArgsArray,
+                            parameter, argumentsCount, ref argsConsumedCount, syntax, argumentsToParams, diagnostics);
 
                         sourceIndices = sourceIndices ?? CreateSourceIndicesArray(i, parameterCount);
                         sourceIndices[i] = matchingArgumentIndex;
                     }
                 }
                 else
                 {
-                    reorderedArgument = GetDefaultValueArgument(parameter, syntax, diagnostics);
+                    reorderedArgument = GetDefaultValueArgument(parameter, syntax, argumentsToParams, argumentsCount, diagnostics);
                     sourceIndices = sourceIndices ?? CreateSourceIndicesArray(i, parameterCount);
                 }
 
@@ -697,6 +687,36 @@ private ImmutableArray<TypedConstant> GetRewrittenAttributeConstructorArguments(
 
             constructorArgumentsSourceIndices = sourceIndices != null ? sourceIndices.AsImmutableOrNull() : default(ImmutableArray<int>);
             return reorderedArguments.AsImmutableOrNull();
+
+            // Local functions
+            TypedConstant getMatchingNamedOrOptionalConstructorArgument(
+                out int matchingArgumentIndex,
+                ImmutableArray<TypedConstant> constructorArgsArray,
+                ParameterSymbol parameter,
+                int argumentsCount,
+                ref int argsConsumedCount,
+                AttributeSyntax syntax,
+                ImmutableArray<int> argumentsToParams,
+                BindingDiagnosticBag diagnostics)
+            {
+                matchingArgumentIndex = argumentsToParams.IsDefaultOrEmpty
+                    ? parameter.Ordinal
+                    : argumentsToParams.IndexOf(parameter.Ordinal);
+
+                if (matchingArgumentIndex > -1)
+                {
+                    // found a matching named argument
+                    Debug.Assert(matchingArgumentIndex < argumentsCount);
+
+                    // increment argsConsumedCount
+                    argsConsumedCount++;
+                    return constructorArgsArray[matchingArgumentIndex];
+                }
+                else
+                {
+                    return GetDefaultValueArgument(parameter, syntax, argumentsToParams, argumentsCount, diagnostics);
+                }
+            }
         }
 
         private static int[] CreateSourceIndicesArray(int paramIndex, int parameterCount)
@@ -718,36 +738,6 @@ private static int[] CreateSourceIndicesArray(int paramIndex, int parameterCount
             return sourceIndices;
         }
 
-        private TypedConstant GetMatchingNamedOrOptionalConstructorArgument(
-            out int matchingArgumentIndex,
-            ImmutableArray<TypedConstant> constructorArgsArray,
-            ImmutableArray<string?> constructorArgumentNamesOpt,
-            ParameterSymbol parameter,
-            int startIndex,
-            int argumentsCount,
-            ref int argsConsumedCount,
-            AttributeSyntax syntax,
-            BindingDiagnosticBag diagnostics)
-        {
-            int index = GetMatchingNamedConstructorArgumentIndex(parameter.Name, constructorArgumentNamesOpt, startIndex, argumentsCount);
-
-            if (index < argumentsCount)
-            {
-                // found a matching named argument
-                Debug.Assert(index >= startIndex);
-
-                // increment argsConsumedCount
-                argsConsumedCount++;
-                matchingArgumentIndex = index;
-                return constructorArgsArray[index];
-            }
-            else
-            {
-                matchingArgumentIndex = -1;
-                return GetDefaultValueArgument(parameter, syntax, diagnostics);
-            }
-        }
-
         private static int GetMatchingNamedConstructorArgumentIndex(string parameterName, ImmutableArray<string?> argumentNamesOpt, int startIndex, int argumentsCount)
         {
             RoslynDebug.Assert(parameterName != null);
@@ -775,7 +765,7 @@ private static int GetMatchingNamedConstructorArgumentIndex(string parameterName
             return argIndex;
         }
 
-        private TypedConstant GetDefaultValueArgument(ParameterSymbol parameter, AttributeSyntax syntax, BindingDiagnosticBag diagnostics)
+        private TypedConstant GetDefaultValueArgument(ParameterSymbol parameter, AttributeSyntax syntax, ImmutableArray<int> argumentsToParams, int argumentsCount, BindingDiagnosticBag diagnostics)
         {
             var parameterType = parameter.Type;
             ConstantValue? defaultConstantValue = parameter.IsOptional ? parameter.ExplicitDefaultConstantValue : ConstantValue.NotAvailable;
@@ -803,22 +793,32 @@ private TypedConstant GetDefaultValueArgument(ParameterSymbol parameter, Attribu
                 else
                 {
                     // Boxing or identity conversion:
-                    parameterType = Compilation.GetSpecialType(SpecialType.System_Int32);
+                    parameterType = GetSpecialType(SpecialType.System_Int32, diagnostics, syntax);
                     defaultValue = line;
                 }
             }
             else if (!IsEarlyAttributeBinder && parameter.IsCallerFilePath)
             {
-                parameterType = Compilation.GetSpecialType(SpecialType.System_String);
+                parameterType = GetSpecialType(SpecialType.System_String, diagnostics, syntax);
                 kind = TypedConstantKind.Primitive;
                 defaultValue = syntax.SyntaxTree.GetDisplayPath(syntax.Name.Span, Compilation.Options.SourceReferenceResolver);
             }
             else if (!IsEarlyAttributeBinder && parameter.IsCallerMemberName && (object)((ContextualAttributeBinder)this).AttributedMember != null)
             {
-                parameterType = Compilation.GetSpecialType(SpecialType.System_String);
+                parameterType = GetSpecialType(SpecialType.System_String, diagnostics, syntax);
                 kind = TypedConstantKind.Primitive;
                 defaultValue = ((ContextualAttributeBinder)this).AttributedMember.GetMemberCallerName();
             }
+            // We check IsCallerMemberName here since the above if can be reached with AttributedMember == null, in which case,
+            // We shouldn't be checking CallerArgumentExpression
+            else if (!IsEarlyAttributeBinder && syntax.ArgumentList is not null && !parameter.IsCallerMemberName &&
+                getCallerArgumentArgumentIndex(parameter, argumentsToParams) is int argumentIndex && argumentIndex > -1 && argumentIndex < argumentsCount)
+            {
+                Debug.Assert(argumentsCount <= syntax.ArgumentList.Arguments.Count);
+                parameterType = GetSpecialType(SpecialType.System_String, diagnostics, syntax);
+                kind = TypedConstantKind.Primitive;
+                defaultValue = syntax.ArgumentList.Arguments[argumentIndex].Expression.ToString();
+            }
             else if (defaultConstantValue == ConstantValue.NotAvailable)
             {
                 // There is no constant value given for the parameter in source/metadata.
@@ -874,6 +874,13 @@ private TypedConstant GetDefaultValueArgument(ParameterSymbol parameter, Attribu
             {
                 return new TypedConstant(parameterType, kind, defaultValue);
             }
+
+            static int getCallerArgumentArgumentIndex(ParameterSymbol parameter, ImmutableArray<int> argumentsToParams)
+            {
+                return argumentsToParams.IsDefault || parameter.CallerArgumentExpressionParameterIndex == -1
+                        ? parameter.CallerArgumentExpressionParameterIndex
+                        : argumentsToParams.IndexOf(parameter.CallerArgumentExpressionParameterIndex);
+            }
         }
 
         private static TypedConstant GetParamArrayArgument(ParameterSymbol parameter, ImmutableArray<TypedConstant> constructorArgsArray,

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

@@ -1322,6 +1322,7 @@ internal void BindDefaultArguments(
             // Params array is filled in the local rewriter
             var lastIndex = expanded ? ^1 : ^0;
 
+            var argumentsCount = argumentsBuilder.Count;
             // Go over missing parameters, inserting default values for optional parameters
             foreach (var parameter in parameters.AsSpan()[..lastIndex])
             {
@@ -1330,7 +1331,7 @@ internal void BindDefaultArguments(
                     Debug.Assert(parameter.IsOptional || !assertMissingParametersAreOptional);
 
                     defaultArguments[argumentsBuilder.Count] = true;
-                    argumentsBuilder.Add(bindDefaultArgument(node, parameter, containingMember, enableCallerInfo, diagnostics));
+                    argumentsBuilder.Add(bindDefaultArgument(node, parameter, containingMember, enableCallerInfo, diagnostics, argumentsBuilder, argumentsCount, argsToParamsOpt));
 
                     if (argumentRefKindsBuilder is { Count: > 0 })
                     {
@@ -1349,7 +1350,7 @@ internal void BindDefaultArguments(
                 argsToParamsBuilder.Free();
             }
 
-            BoundExpression bindDefaultArgument(SyntaxNode syntax, ParameterSymbol parameter, Symbol containingMember, bool enableCallerInfo, BindingDiagnosticBag diagnostics)
+            BoundExpression bindDefaultArgument(SyntaxNode syntax, ParameterSymbol parameter, Symbol containingMember, bool enableCallerInfo, BindingDiagnosticBag diagnostics, ArrayBuilder<BoundExpression> argumentsBuilder, int argumentsCount, ImmutableArray<int> argsToParamsOpt)
             {
                 TypeSymbol parameterType = parameter.Type;
                 if (Flags.Includes(BinderFlags.ParameterDefaultValue))
@@ -1384,6 +1385,12 @@ BoundExpression bindDefaultArgument(SyntaxNode syntax, ParameterSymbol parameter
                     var memberName = containingMember.GetMemberCallerName();
                     defaultValue = new BoundLiteral(syntax, ConstantValue.Create(memberName), Compilation.GetSpecialType(SpecialType.System_String)) { WasCompilerGenerated = true };
                 }
+                else if (callerSourceLocation is object && getArgumentIndex(parameter.CallerArgumentExpressionParameterIndex, argsToParamsOpt) is int argumentIndex &&
+                    argumentIndex > -1 && argumentIndex < argumentsCount)
+                {
+                    var argument = argumentsBuilder[argumentIndex];
+                    defaultValue = new BoundLiteral(syntax, ConstantValue.Create(argument.Syntax.ToString()), Compilation.GetSpecialType(SpecialType.System_String)) { WasCompilerGenerated = true };
+                }
                 else if (defaultConstantValue == ConstantValue.NotAvailable)
                 {
                     // There is no constant value given for the parameter in source/metadata.
@@ -1437,6 +1444,11 @@ BoundExpression bindDefaultArgument(SyntaxNode syntax, ParameterSymbol parameter
                 }
 
                 return defaultValue;
+
+                static int getArgumentIndex(int parameterIndex, ImmutableArray<int> argsToParamsOpt)
+                    => argsToParamsOpt.IsDefault
+                        ? parameterIndex
+                        : argsToParamsOpt.IndexOf(parameterIndex);
             }
 
         }