Merge pull request #55769 from allisonchou/RevertRPSCherryPick2

Revert "Merge pull request #55738 from dotnet/main"

Author: allisonchou

docs/features/ExpressionVariables.md

@@ -6,12 +6,12 @@ containing expression variables (out variable declarations and declaration patte
 initializers, property initializers, ctor-initializers, and query clauses.
 
 See https://github.com/dotnet/csharplang/issues/32 and 
-https://github.com/dotnet/csharplang/blob/main/proposals/csharp-7.3/expression-variables-in-initializers.md 
+https://github.com/dotnet/csharplang/blob/main/proposals/expression-variables-in-initializers.md 
 for more information.
 
 Current state of the feature:
 
 [X] Permit in field initializers
 [X] Permit in property initializers
 [ ] Permit in ctor-initializers
-[X] Permit in query clauses
+[X] Permit in query clauses

dotnet-tools.json

@@ -2,7 +2,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-format": {
-      "version": "6.0.240501",
+      "version": "6.0.231801",
       "commands": [
         "dotnet-format"
       ]

eng/Versions.props

@@ -30,8 +30,7 @@
     <RoslynDiagnosticsNugetPackageVersion>3.3.3-beta1.21105.3</RoslynDiagnosticsNugetPackageVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21366.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.0-beta1.21322.2</MicrosoftCodeAnalysisTestingVersion>
-    <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
-    <CodeStyleAnalyzerVersion>4.0.0-3.final</CodeStyleAnalyzerVersion>
+    <CodeStyleAnalyzerVersion>3.10.0</CodeStyleAnalyzerVersion>
     <VisualStudioEditorPackagesVersion>16.10.230</VisualStudioEditorPackagesVersion>
     <VisualStudioEditorNewPackagesVersion>17.0.278-preview</VisualStudioEditorNewPackagesVersion>
     <ILAsmPackageVersion>5.0.0-alpha1.19409.1</ILAsmPackageVersion>

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

@@ -187,7 +187,7 @@ bool tryBindAsHandlerType([NotNullWhen(true)] out BoundInterpolatedString? resul
             {
                 result = null;
 
-                if (InExpressionTree || !ValidateInterpolatedStringParts(unconvertedInterpolatedString))
+                if (InExpressionTree || unconvertedInterpolatedString.Parts.ContainsAwaitExpression())
                 {
                     return false;
                 }
@@ -204,12 +204,8 @@ bool tryBindAsHandlerType([NotNullWhen(true)] out BoundInterpolatedString? resul
             }
         }
 
-        private static bool ValidateInterpolatedStringParts(BoundUnconvertedInterpolatedString unconvertedInterpolatedString)
-            => !unconvertedInterpolatedString.Parts.ContainsAwaitExpression()
-               && unconvertedInterpolatedString.Parts.All(p => p is not BoundStringInsert { Value.Type.TypeKind: TypeKind.Dynamic });
-
         private static bool AllInterpolatedStringPartsAreStrings(ImmutableArray<BoundExpression> parts)
-            => parts.All(p => p is BoundLiteral or BoundStringInsert { Value.Type.SpecialType: SpecialType.System_String, Alignment: null, Format: null });
+            => parts.All(p => p is BoundLiteral or BoundStringInsert { Value: { Type: { SpecialType: SpecialType.System_String } }, Alignment: null, Format: null });
 
         private bool TryBindUnconvertedBinaryOperatorToDefaultInterpolatedStringHandler(BoundBinaryOperator binaryOperator, BindingDiagnosticBag diagnostics, [NotNullWhen(true)] out BoundBinaryOperator? convertedBinaryOperator)
         {
@@ -244,7 +240,7 @@ private bool TryBindUnconvertedBinaryOperatorToDefaultInterpolatedStringHandler(
                 isConstant = isConstant && current.Right.ConstantValue is not null;
                 var rightInterpolatedString = (BoundUnconvertedInterpolatedString)current.Right;
 
-                if (!ValidateInterpolatedStringParts(rightInterpolatedString))
+                if (rightInterpolatedString.Parts.ContainsAwaitExpression())
                 {
                     // Exception to case 3. Delegate to standard binding.
                     stack.Free();
@@ -263,7 +259,7 @@ private bool TryBindUnconvertedBinaryOperatorToDefaultInterpolatedStringHandler(
                     case BoundUnconvertedInterpolatedString interpolatedString:
                         isConstant = isConstant && interpolatedString.ConstantValue is not null;
 
-                        if (!ValidateInterpolatedStringParts(interpolatedString))
+                        if (interpolatedString.Parts.ContainsAwaitExpression())
                         {
                             // Exception to case 3. Delegate to standard binding.
                             stack.Free();

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

@@ -1878,15 +1878,6 @@ internal void GenerateAnonymousFunctionConversionError(BindingDiagnosticBag diag
                 return;
             }
 
-            if (reason == LambdaConversionResult.CannotInferDelegateType)
-            {
-                Debug.Assert(targetType.SpecialType == SpecialType.System_Delegate || targetType.IsNonGenericExpressionType());
-                Error(diagnostics, ErrorCode.ERR_CannotInferDelegateType, syntax);
-                var lambda = anonymousFunction.BindForErrorRecovery();
-                diagnostics.AddRange(lambda.Diagnostics);
-                return;
-            }
-
             // At this point we know that we have either a delegate type or an expression type for the target.
 
             // The target type is a valid delegate or expression tree type. Is there something wrong with the

src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/ConversionsBase.cs

@@ -6,6 +6,7 @@
 
 using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -1393,8 +1394,7 @@ private static LambdaConversionResult IsAnonymousFunctionCompatibleWithExpressio
 
             if (delegateType is null)
             {
-                Debug.Assert(IsFeatureInferredDelegateTypeEnabled(anonymousFunction));
-                return GetInferredDelegateTypeResult(anonymousFunction);
+                return LambdaConversionResult.Success;
             }
 
             return IsAnonymousFunctionCompatibleWithDelegate(anonymousFunction, delegateType, isTargetExpressionTree: true);
@@ -1409,7 +1409,7 @@ public static LambdaConversionResult IsAnonymousFunctionCompatibleWithType(Unbou
             {
                 if (IsFeatureInferredDelegateTypeEnabled(anonymousFunction))
                 {
-                    return GetInferredDelegateTypeResult(anonymousFunction);
+                    return LambdaConversionResult.Success;
                 }
             }
             else if (type.IsDelegateType())
@@ -1432,14 +1432,6 @@ internal static bool IsFeatureInferredDelegateTypeEnabled(BoundExpression expr)
             return expr.Syntax.IsFeatureEnabled(MessageID.IDS_FeatureInferredDelegateType);
         }
 
-        private static LambdaConversionResult GetInferredDelegateTypeResult(UnboundLambda anonymousFunction)
-        {
-            var discardedUseSiteInfo = CompoundUseSiteInfo<AssemblySymbol>.Discarded;
-            return anonymousFunction.InferDelegateType(ref discardedUseSiteInfo) is null ?
-                LambdaConversionResult.CannotInferDelegateType :
-                LambdaConversionResult.Success;
-        }
-
         private static bool HasAnonymousFunctionConversion(BoundExpression source, TypeSymbol destination)
         {
             Debug.Assert(source != null);

src/Compilers/CSharp/Portable/Binder/Semantics/Conversions/LambdaConversionResult.cs

@@ -16,7 +16,6 @@ internal enum LambdaConversionResult
         StaticTypeInImplicitlyTypedLambda,
         ExpressionTreeMustHaveDelegateTypeArgument,
         ExpressionTreeFromAnonymousMethod,
-        CannotInferDelegateType,
         BindingFailed
     }
 }

src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberContainerSymbol.cs

@@ -3650,7 +3650,7 @@ private void AddSynthesizedRecordMembersIfNecessary(MembersAndInitializersBuilde
             memberNames.Free();
 
             // Synthesizing non-readonly properties in struct would require changing readonly logic for PrintMembers method synthesis
-            Debug.Assert(isRecordClass || !members.Any(m => m is PropertySymbol { GetMethod.IsEffectivelyReadOnly: false }));
+            Debug.Assert(isRecordClass || !members.Any(m => m is PropertySymbol { GetMethod.IsEffectivelyReadOnly : false }));
 
             // We put synthesized record members first so that errors about conflicts show up on user-defined members rather than all
             // going to the record declaration

src/Compilers/CSharp/Portable/Symbols/Synthesized/Records/SynthesizedRecordCopyCtor.cs

@@ -101,7 +101,7 @@ internal override void GenerateMethodBodyStatements(SyntheticBoundNodeFactory F,
 
         internal static bool IsCopyConstructor(Symbol member)
         {
-            if (member is MethodSymbol { ContainingType.IsRecordStruct: false, MethodKind: MethodKind.Constructor } method)
+            if (member is MethodSymbol { ContainingType: { IsRecordStruct: false }, MethodKind: MethodKind.Constructor } method)
             {
                 return HasCopyConstructorSignature(method);
             }

src/Compilers/CSharp/Portable/Syntax/InternalSyntax/CSharpSyntaxNode.cs

@@ -4,7 +4,6 @@
 
 #nullable disable
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -280,8 +279,8 @@ public override bool IsTriviaWithEndOfLine()
         }
 
         // Use conditional weak table so we always return same identity for structured trivia
-        private static readonly ConditionalWeakTable<SyntaxNode, Dictionary<CodeAnalysis.SyntaxTrivia, WeakReference<SyntaxNode>>> s_structuresTable
-            = new ConditionalWeakTable<SyntaxNode, Dictionary<CodeAnalysis.SyntaxTrivia, WeakReference<SyntaxNode>>>();
+        private static readonly ConditionalWeakTable<SyntaxNode, Dictionary<CodeAnalysis.SyntaxTrivia, SyntaxNode>> s_structuresTable
+            = new ConditionalWeakTable<SyntaxNode, Dictionary<CodeAnalysis.SyntaxTrivia, SyntaxNode>>();
 
         /// <summary>
         /// Gets the syntax node represented the structure of this trivia, if any. The HasStructure property can be used to 
@@ -309,15 +308,10 @@ public override SyntaxNode GetStructure(Microsoft.CodeAnalysis.SyntaxTrivia triv
                     var structsInParent = s_structuresTable.GetOrCreateValue(parent);
                     lock (structsInParent)
                     {
-                        if (!structsInParent.TryGetValue(trivia, out var weakStructure))
+                        if (!structsInParent.TryGetValue(trivia, out structure))
                         {
                             structure = CSharp.Syntax.StructuredTriviaSyntax.Create(trivia);
-                            structsInParent.Add(trivia, new WeakReference<SyntaxNode>(structure));
-                        }
-                        else if (!weakStructure.TryGetTarget(out structure))
-                        {
-                            structure = CSharp.Syntax.StructuredTriviaSyntax.Create(trivia);
-                            weakStructure.SetTarget(structure);
+                            structsInParent.Add(trivia, structure);
                         }
                     }