Get CallerArgumentExpression ready

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

@@ -815,7 +815,6 @@ private TypedConstant GetDefaultValueArgument(ParameterSymbol parameter, Attribu
                 getCallerArgumentArgumentIndex(parameter, argumentsToParams) is int argumentIndex && argumentIndex > -1 && argumentIndex < argumentsCount)
             {
                 Debug.Assert(argumentsCount <= syntax.ArgumentList.Arguments.Count);
-                CheckFeatureAvailability(syntax.ArgumentList, MessageID.IDS_FeatureCallerArgumentExpression, diagnostics);
                 parameterType = GetSpecialType(SpecialType.System_String, diagnostics, syntax);
                 kind = TypedConstantKind.Primitive;
                 defaultValue = syntax.ArgumentList.Arguments[argumentIndex].Expression.ToString();

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

@@ -1388,8 +1388,6 @@ BoundExpression bindDefaultArgument(SyntaxNode syntax, ParameterSymbol parameter
                 else if (callerSourceLocation is object && getArgumentIndex(parameter.CallerArgumentExpressionParameterIndex, argsToParamsOpt) is int argumentIndex &&
                     argumentIndex > -1 && argumentIndex < argumentsCount)
                 {
-                    CheckFeatureAvailability(syntax, MessageID.IDS_FeatureCallerArgumentExpression, diagnostics);
-
                     var argument = argumentsBuilder[argumentIndex];
                     defaultValue = new BoundLiteral(syntax, ConstantValue.Create(argument.Syntax.ToString()), Compilation.GetSpecialType(SpecialType.System_String)) { WasCompilerGenerated = true };
                 }

src/Compilers/CSharp/Portable/CSharpResources.resx

@@ -6706,9 +6706,6 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
   <data name="WRN_CallerArgumentExpressionAttributeSelfReferential_Title" xml:space="preserve">
     <value>The CallerArgumentExpressionAttribute applied to parameter will have no effect because it's self-refential.</value>
   </data>
-  <data name="IDS_FeatureCallerArgumentExpression" xml:space="preserve">
-    <value>caller argument expression</value>
-  </data>
   <data name="IDS_FeatureSealedToStringInRecord" xml:space="preserve">
     <value>sealed ToString in record</value>
   </data>

src/Compilers/CSharp/Portable/Errors/MessageID.cs

@@ -233,8 +233,6 @@ internal enum MessageID
         IDS_FeatureLineSpanDirective = MessageBase + 12807,
         IDS_FeatureImprovedInterpolatedStrings = MessageBase + 12808,
         IDS_FeatureFileScopedNamespace = MessageBase + 12809,
-        // PROTOTYPE: compact before merge
-        IDS_FeatureCallerArgumentExpression = MessageBase + 13000,
     }
 
     // Message IDs may refer to strings that need to be localized.
@@ -347,7 +345,6 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
 
                 // C# 10.0 features.
                 case MessageID.IDS_FeatureMixedDeclarationsAndExpressionsInDeconstruction: // semantic check
-                case MessageID.IDS_FeatureCallerArgumentExpression: // semantic check
                 case MessageID.IDS_FeatureSealedToStringInRecord: // semantic check
                 case MessageID.IDS_FeatureImprovedInterpolatedStrings: // semantic check
                 case MessageID.IDS_FeatureRecordStructs:

src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_CallerInfoAttributes.cs

@@ -2174,10 +2174,7 @@ static void Main()
     }
 }";
             var compilation = CreateCompilation(source, targetFramework: TargetFramework.NetCoreApp, options: TestOptions.ReleaseExe, parseOptions: TestOptions.Regular9);
-            compilation.VerifyDiagnostics(
-                // (14,4): error CS8773: Feature 'caller argument expression' is not available in C# 9.0. Please use language version 10.0 or greater.
-                // [My(1+2)]
-                Diagnostic(ErrorCode.ERR_FeatureNotAvailableInVersion9, "(1+2)").WithArguments("caller argument expression", "10.0").WithLocation(14, 4));
+            CompileAndVerify(compilation, expectedOutput: "'3', '1+2'").VerifyDiagnostics();
         }
 
         [ConditionalFact(typeof(CoreClrOnly))]

src/Compilers/VisualBasic/Portable/Binding/Binder_Invocation.vb

@@ -3126,6 +3126,11 @@ ProduceBoundNode:
 
                     Dim isCallerArgumentExpression = callerArgumentExpressionParameterIndex > -1 OrElse (reducedExtensionReceiverOpt IsNot Nothing AndAlso callerArgumentExpressionParameterIndex > -2)
 
+                    If isCallerArgumentExpression AndAlso Not SyntaxTree.Options.Features.ContainsKey(InternalSyntax.GetFeatureFlag(InternalSyntax.Feature.CallerArgumentExpression)) Then
+                        ' Silently require feature flag for this feature until Aleksey approves.
+                        isCallerArgumentExpression = False
+                    End If
+
                     If isCallerLineNumber OrElse isCallerMemberName OrElse isCallerFilePath OrElse isCallerArgumentExpression Then
                         Dim callerInfoValue As ConstantValue = Nothing
 
@@ -3177,10 +3182,6 @@ ProduceBoundNode:
                             End If
 
                             If argumentSyntax IsNot Nothing Then
-                                InternalSyntax.Parser.CheckFeatureAvailability(diagnostics,
-                                                                   argumentSyntax.Location,
-                                                                   DirectCast(argumentSyntax.SyntaxTree.Options, VisualBasicParseOptions).LanguageVersion,
-                                                                   InternalSyntax.Feature.CallerArgumentExpression)
                                 callerInfoValue = ConstantValue.Create(argumentSyntax.ToString())
                             End If
                         End If

src/Compilers/VisualBasic/Portable/LanguageVersion.vb

@@ -21,7 +21,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         VisualBasic15_5 = 1505
         VisualBasic16 = 1600
         VisualBasic16_9 = 1609
-        VisualBasic17 = 1700
 
         Latest = Integer.MaxValue
     End Enum
@@ -40,8 +39,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     LanguageVersion.VisualBasic15_3,
                     LanguageVersion.VisualBasic15_5,
                     LanguageVersion.VisualBasic16,
-                    LanguageVersion.VisualBasic16_9,
-                    LanguageVersion.VisualBasic17
+                    LanguageVersion.VisualBasic16_9
 
                     Return True
             End Select
@@ -73,8 +71,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Return "16"
                 Case LanguageVersion.VisualBasic16_9
                     Return "16.9"
-                Case LanguageVersion.VisualBasic17
-                    Return "17"
                 Case Else
                     Throw ExceptionUtilities.UnexpectedValue(value)
             End Select
@@ -91,17 +87,17 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         Public Function MapSpecifiedToEffectiveVersion(version As LanguageVersion) As LanguageVersion
             Select Case version
                 Case LanguageVersion.Latest
-                    Return LanguageVersion.VisualBasic17
+                    Return LanguageVersion.VisualBasic16_9
                 Case LanguageVersion.Default
-                    Return LanguageVersion.VisualBasic17
+                    Return LanguageVersion.VisualBasic16
                 Case Else
                     Return version
             End Select
         End Function
 
         Friend ReadOnly Property CurrentVersion As LanguageVersion
             Get
-                Return LanguageVersion.VisualBasic17
+                Return LanguageVersion.VisualBasic16_9
             End Get
         End Property
 
@@ -132,8 +128,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Return "16"
                 Case LanguageVersion.VisualBasic16_9
                     Return "16.9"
-                Case LanguageVersion.VisualBasic17
-                    Return "17"
                 Case LanguageVersion.Default
                     Return "default"
                 Case LanguageVersion.Latest
@@ -173,8 +167,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     result = LanguageVersion.VisualBasic16
                 Case "16.9"
                     result = LanguageVersion.VisualBasic16_9
-                Case "17", "17.0"
-                    result = LanguageVersion.VisualBasic17
                 Case "default"
                     result = LanguageVersion.Default
                 Case "latest"

src/Compilers/VisualBasic/Portable/Parser/ParserFeature.vb

@@ -48,6 +48,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax
         <Extension>
         Friend Function GetFeatureFlag(feature As Feature) As String
             Select Case feature
+                Case Feature.CallerArgumentExpression
+                    Return NameOf(Feature.CallerArgumentExpression)
                 Case Else
                     Return Nothing
             End Select
@@ -106,10 +108,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Syntax.InternalSyntax
 
                 Case Feature.InitOnlySettersUsage
                     Return LanguageVersion.VisualBasic16_9
-
-                Case Feature.CallerArgumentExpression
-                    Return LanguageVersion.VisualBasic17
-
                 Case Else
                     Throw ExceptionUtilities.UnexpectedValue(feature)
             End Select

src/Compilers/VisualBasic/Portable/Symbols/Source/SourceComplexParameterSymbol.vb

@@ -2,15 +2,11 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
-Imports System.Collections.Generic
 Imports System.Collections.Immutable
-Imports System.Runtime.InteropServices
 Imports System.Threading
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Binder
-Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports TypeKind = Microsoft.CodeAnalysis.TypeKind
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
     ''' <summary>
@@ -253,6 +249,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
 
         Friend Overrides ReadOnly Property CallerArgumentExpressionParameterIndex As Integer
             Get
+                If Not _syntaxRef.SyntaxTree.Options.Features.ContainsKey(InternalSyntax.GetFeatureFlag(InternalSyntax.Feature.CallerArgumentExpression)) Then
+                    ' Silently require feature flag for this feature until Aleksey approves.
+                    Return -1
+                End If
+
                 Dim attributeSource As SourceParameterSymbol = If(Me.BoundAttributesSource, Me)
 
                 Dim data = attributeSource.GetEarlyDecodedWellKnownAttributeData()