Merge pull request #49987 from dotnet/features/ioperation

Merge features/ioperation into master
dotnet · Dec 16, 2020 · c97b744967352897f9ee3a9b1f21fc6c4fe5084c · c97b744
2 parents 64769f8 + df0bce1
commit c97b744967352897f9ee3a9b1f21fc6c4fe5084c
diff --git a/Compilers.slnf b/Compilers.slnf
@@ -71,4 +71,4 @@
       "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj"
     ]
   }
-}
+}
diff --git a/eng/generate-compiler-code.ps1 b/eng/generate-compiler-code.ps1
@@ -8,10 +8,10 @@ param ([string]$configuration = "Debug",
 Set-StrictMode -version 2.0
 $ErrorActionPreference="Stop"
 
-function Run-Tool($projectFilePath, $toolArgs) {
+function Run-Tool($projectFilePath, $toolArgs, $targetFramework) {
   $toolName = Split-Path -leaf $projectFilePath
   Write-Host "Running $toolName $toolArgs"
-  Exec-Console $dotnet "run -p $projectFilePath --framework netcoreapp3.1 $toolArgs"
+  Exec-Console $dotnet "run -p $projectFilePath --framework $targetFramework $toolArgs"
 }
 
 function Run-LanguageCore($language, $languageSuffix, $languageDir, $syntaxProject, $errorFactsProject, $generatedDir, $generatedTestDir) {
@@ -22,18 +22,19 @@ function Run-LanguageCore($language, $languageSuffix, $languageDir, $syntaxProje
   $errorFileName = if ($language -eq "CSharp") { "ErrorCode.cs" } else { "Errors.vb" }
   $errorFilePath = Join-Path $languageDir "Errors\$errorFileName"
   $errorGeneratedFilePath = Join-Path $generatedDir "ErrorFacts.Generated.$($languageSuffix)"
+  $targetFramework = "netcoreapp3.1"
 
   Create-Directory $generatedDir
   Create-Directory $generatedTestDir
 
   # The C# syntax is now generated by a source generator
   if ($language -ne "CSharp") {
-	  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$generatedDir`""
+	  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$generatedDir`"" $targetFramework
   }
-  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$generatedDir`" /grammar"
-  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$syntaxTestFilePath`" /test"
-  Run-Tool $boundTreeGenProject "$language `"$boundFilePath`" `"$boundGeneratedFilePath`""
-  Run-Tool $errorFactsProject "`"$errorFilePath`" `"$errorGeneratedFilePath`""
+  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$generatedDir`" /grammar" $targetFramework
+  Run-Tool $syntaxProject "`"$syntaxFilePath`" `"$syntaxTestFilePath`" /test" $targetFramework
+  Run-Tool $boundTreeGenProject "$language `"$boundFilePath`" `"$boundGeneratedFilePath`"" $targetFramework
+  Run-Tool $errorFactsProject "`"$errorFilePath`" `"$errorGeneratedFilePath`"" $targetFramework
 }
 
 # Test the contents of our generated files to ensure they are equal.  Compares our checked
@@ -73,13 +74,14 @@ function Run-IOperation($coreDir, $ioperationProject) {
   $operationsDir = Join-Path $coreDir "Operations"
   $operationsXml = Join-Path $operationsDir "OperationInterfaces.xml"
   $generationDir = Join-Path $coreDir "Generated"
+  $targetFramework = "net5.0"
 
   if (-not $test) {
-    Run-Tool $ioperationProject "`"$operationsXml`" `"$generationDir`""
+    Run-Tool $ioperationProject "`"$operationsXml`" `"$generationDir`"" $targetFramework
   } else {
     $scratchDir = Join-Path $generationTempDir "Core\Operations"
     Create-Directory $scratchDir
-    Run-Tool $ioperationProject "`"$operationsXml`" `"$scratchDir`""
+    Run-Tool $ioperationProject "`"$operationsXml`" `"$scratchDir`"" $targetFramework
     Test-GeneratedContent $generationDir $scratchDir
   }
 }
@@ -89,7 +91,7 @@ function Run-GetTextCore($generatedDir) {
   $syntaxTextFilePath = Join-Path $generatedDir "Syntax.xml.GetText.Generated.vb"
 
   Create-Directory $generatedDir
-  Run-Tool $basicSyntaxProject "`"$syntaxFilePath`" `"$syntaxTextFilePath`" /gettext"
+  Run-Tool $basicSyntaxProject "`"$syntaxFilePath`" `"$syntaxTextFilePath`" /gettext" "netcoreapp3.1"
 }
 
 function Run-GetText() {

diff --git a/...actRemoveUnusedParametersAndValuesDiagnosticAnalyzer.SymbolStartAnalyzer.BlockAnalyzer.cs b/...actRemoveUnusedParametersAndValuesDiagnosticAnalyzer.SymbolStartAnalyzer.BlockAnalyzer.cs
@@ -135,7 +135,7 @@ bool HasConditionalDirectives()
 
                     static bool IsSingleThrowNotImplementedOperation(IOperation firstBlock)
                     {
-                        var compilation = firstBlock.SemanticModel.Compilation;
+                        var compilation = firstBlock.SemanticModel!.Compilation;
                         var notImplementedExceptionType = compilation.NotImplementedExceptionType();
                         if (notImplementedExceptionType == null)
                             return false;
@@ -182,7 +182,7 @@ static bool IsThrowNotImplementedOperation(INamedTypeSymbol notImplementedExcept
                            UnwrapImplicitConversion(throwOperation.Exception) is IObjectCreationOperation objectCreation &&
                            notImplementedExceptionType.Equals(objectCreation.Type);
 
-                    static IOperation UnwrapImplicitConversion(IOperation value)
+                    static IOperation? UnwrapImplicitConversion(IOperation? value)
                         => value is IConversionOperation conversion && conversion.IsImplicit
                             ? conversion.Operand
                             : value;

diff --git a/src/Analyzers/Core/Analyzers/SimplifyInterpolation/Helpers.cs b/src/Analyzers/Core/Analyzers/SimplifyInterpolation/Helpers.cs
@@ -89,12 +89,12 @@ private static IOperation Unwrap(IOperation expression)
         {
             if (expression is IInvocationOperation { TargetMethod: { Name: nameof(ToString) } } invocation &&
                 HasNonImplicitInstance(invocation) &&
-                !syntaxFacts.IsBaseExpression(invocation.Instance.Syntax) &&
-                !invocation.Instance.Type.IsRefLikeType)
+                !syntaxFacts.IsBaseExpression(invocation.Instance!.Syntax) &&
+                !invocation.Instance.Type!.IsRefLikeType)
             {
                 if (invocation.Arguments.Length == 1 &&
                     invocation.Arguments[0].Value is ILiteralOperation { ConstantValue: { HasValue: true, Value: string value } } literal &&
-                    invocation.SemanticModel.Compilation.GetTypeByMetadataName(typeof(System.IFormattable).FullName!) is { } systemIFormattable &&
+                    invocation.SemanticModel!.Compilation.GetTypeByMetadataName(typeof(System.IFormattable).FullName!) is { } systemIFormattable &&
                     invocation.Instance.Type.Implements(systemIFormattable))
                 {
                     unwrapped = invocation.Instance;
@@ -164,7 +164,7 @@ private static TextSpan GetSpanWithinLiteralQuotes(IVirtualCharService virtualCh
                             {
                                 var alignmentSyntax = alignmentOp.Syntax;
 
-                                unwrapped = invocation.Instance;
+                                unwrapped = invocation.Instance!;
                                 alignment = alignmentSyntax as TExpressionSyntax;
                                 negate = targetName == nameof(string.PadRight);
 

diff --git a/...rs/UseConditionalExpression/ForAssignment/UseConditionalExpressionForAssignmentHelpers.cs b/...rs/UseConditionalExpression/ForAssignment/UseConditionalExpressionForAssignmentHelpers.cs
@@ -14,7 +14,7 @@ internal static class UseConditionalExpressionForAssignmentHelpers
             ISyntaxFacts syntaxFacts,
             IConditionalOperation ifOperation,
             [NotNullWhen(true)] out IOperation trueStatement,
-            [NotNullWhen(true)] out IOperation falseStatement,
+            [NotNullWhen(true)] out IOperation? falseStatement,
             out ISimpleAssignmentOperation? trueAssignment,
             out ISimpleAssignmentOperation? falseAssignment)
         {
@@ -52,7 +52,7 @@ internal static class UseConditionalExpressionForAssignmentHelpers
         }
 
         private static bool TryGetAssignmentOrThrow(
-            IOperation statement,
+            [NotNullWhen(true)] IOperation? statement,
             out ISimpleAssignmentOperation? assignment,
             out IThrowOperation? throwOperation)
         {

diff --git a/src/Analyzers/Core/Analyzers/UseConditionalExpression/UseConditionalExpressionHelpers.cs b/src/Analyzers/Core/Analyzers/UseConditionalExpression/UseConditionalExpressionHelpers.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
 
@@ -48,7 +49,8 @@ internal static partial class UseConditionalExpressionHelpers
         /// Will unwrap a block with a single statement in it to just that block.  Used so we can
         /// support both <c>if (expr) { statement }</c> and <c>if (expr) statement</c>
         /// </summary>
-        public static IOperation UnwrapSingleStatementBlock(IOperation statement)
+        [return: NotNullIfNotNull("statement")]
+        public static IOperation? UnwrapSingleStatementBlock(IOperation? statement)
             => statement is IBlockOperation block && block.Operations.Length == 1
                 ? block.Operations[0]
                 : statement;

diff --git a/src/Analyzers/Core/Analyzers/UseSystemHashCode/Analyzer.OperationDeconstructor.cs b/src/Analyzers/Core/Analyzers/UseSystemHashCode/Analyzer.OperationDeconstructor.cs
@@ -4,9 +4,11 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.CodeAnalysis.PooledObjects;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.UseSystemHashCode
 {
@@ -79,6 +81,7 @@ public bool TryAddHashedSymbol(IOperation value, bool seenHash)
                             //      (hashCode * -1521134295 + a.GetHashCode()).GetHashCode()
                             //
                             // recurse on the value we're calling GetHashCode on.
+                            RoslynDebug.Assert(invocation.Instance is not null);
                             return TryAddHashedSymbol(invocation.Instance, seenHash: true);
                         }
 
@@ -106,6 +109,7 @@ public bool TryAddHashedSymbol(IOperation value, bool seenHash)
                             if (binary.OperatorKind == BinaryOperatorKind.Equals)
                             {
                                 // (StringProperty == null ? 0 : StringProperty.GetHashCode())
+                                RoslynDebug.Assert(conditional.WhenFalse is not null);
                                 return TryAddHashedSymbol(conditional.WhenFalse, seenHash: true);
                             }
                             else if (binary.OperatorKind == BinaryOperatorKind.NotEquals)

diff --git a/src/Analyzers/Core/Analyzers/UseSystemHashCode/Analyzer.cs b/src/Analyzers/Core/Analyzers/UseSystemHashCode/Analyzer.cs
@@ -99,13 +99,13 @@ public static bool TryGetAnalyzer(Compilation compilation, [NotNullWhen(true)] o
                 return null;
             }
 
-            if (!(statements[0] is IReturnOperation returnOperation))
+            if (!(statements[0] is IReturnOperation { ReturnedValue: { } returnedValue }))
             {
                 return null;
             }
 
             using var analyzer = new OperationDeconstructor(this, method, hashCodeVariable: null);
-            if (!analyzer.TryAddHashedSymbol(returnOperation.ReturnedValue, seenHash: false))
+            if (!analyzer.TryAddHashedSymbol(returnedValue, seenHash: false))
             {
                 return null;
             }
@@ -134,7 +134,7 @@ public static bool TryGetAnalyzer(Compilation compilation, [NotNullWhen(true)] o
             // First statement has to be the declaration of the accumulator.
             // Last statement has to be the return of it.
             if (!(statements.First() is IVariableDeclarationGroupOperation varDeclStatement) ||
-                !(statements.Last() is IReturnOperation returnStatement))
+                !(statements.Last() is IReturnOperation { ReturnedValue: { } returnedValue }))
             {
                 return null;
             }
@@ -160,7 +160,7 @@ public static bool TryGetAnalyzer(Compilation compilation, [NotNullWhen(true)] o
             }
 
             var hashCodeVariable = declarator.Symbol;
-            if (!(IsLocalReference(returnStatement.ReturnedValue, hashCodeVariable)))
+            if (!(IsLocalReference(returnedValue, hashCodeVariable)))
             {
                 return null;
             }

diff --git a/...nalyzers/Core/CodeFixes/PopulateSwitch/AbstractPopulateSwitchExpressionCodeFixProvider.cs b/...nalyzers/Core/CodeFixes/PopulateSwitch/AbstractPopulateSwitchExpressionCodeFixProvider.cs
@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.PopulateSwitch
 {
@@ -40,7 +41,7 @@ protected AbstractPopulateSwitchExpressionCodeFixProvider()
         }
 
         protected sealed override ITypeSymbol GetSwitchType(ISwitchExpressionOperation switchExpression)
-            => switchExpression.Value.Type;
+            => switchExpression.Value.Type ?? throw ExceptionUtilities.Unreachable;
 
         protected sealed override ICollection<ISymbol> GetMissingEnumMembers(ISwitchExpressionOperation switchOperation)
             => PopulateSwitchExpressionHelpers.GetMissingEnumMembers(switchOperation);

diff --git a/...Analyzers/Core/CodeFixes/PopulateSwitch/AbstractPopulateSwitchStatementCodeFixProvider.cs b/...Analyzers/Core/CodeFixes/PopulateSwitch/AbstractPopulateSwitchStatementCodeFixProvider.cs
@@ -57,7 +57,7 @@ protected AbstractPopulateSwitchStatementCodeFixProvider()
         }
 
         protected sealed override ITypeSymbol GetSwitchType(ISwitchOperation switchOperation)
-            => switchOperation.Value.Type;
+            => switchOperation.Value.Type ?? throw ExceptionUtilities.Unreachable;
 
         protected sealed override ICollection<ISymbol> GetMissingEnumMembers(ISwitchOperation switchOperation)
             => PopulateSwitchStatementHelpers.GetMissingEnumMembers(switchOperation);

diff --git a/src/Compilers/CSharp/Portable/Binder/ForEachEnumeratorInfo.cs b/src/Compilers/CSharp/Portable/Binder/ForEachEnumeratorInfo.cs
@@ -27,7 +27,7 @@ internal sealed class ForEachEnumeratorInfo
         public readonly MethodSymbol MoveNextMethod;
 
         // True if the enumerator needs disposal once used. 
-        // Will be either IDisposable/IAsyncDisposable, or use DisposeMethod below if set
+        // Will be either IDisposable/IAsyncDisposable, or use DisposeMethod below if set	
         // Computed during initial binding so that we can expose it in the semantic model.
         public readonly bool NeedsDisposal;
 
@@ -39,6 +39,9 @@ internal sealed class ForEachEnumeratorInfo
         // When using pattern-based Dispose, this stores the method to invoke to Dispose
         public readonly MethodSymbol DisposeMethod;
 
+        // When enumerator needs disposing, this records if the dispose is pattern based or not
+        public readonly bool IsPatternDispose;
+
         // Conversions that will be required when the foreach is lowered.
         public readonly Conversion CollectionConversion; //collection expression to collection type
         public readonly Conversion CurrentConversion; // current to element type
@@ -59,6 +62,7 @@ internal sealed class ForEachEnumeratorInfo
             bool needsDisposal,
             BoundAwaitableInfo disposeAwaitableInfo,
             MethodSymbol disposeMethod,
+            bool isPatternDispose,
             Conversion collectionConversion,
             Conversion currentConversion,
             Conversion enumeratorConversion,
@@ -71,6 +75,7 @@ internal sealed class ForEachEnumeratorInfo
             Debug.Assert((object)currentPropertyGetter != null, "Field 'currentPropertyGetter' cannot be null");
             Debug.Assert((object)moveNextMethod != null, "Field 'moveNextMethod' cannot be null");
             Debug.Assert(binder != null, "Field 'binder' cannot be null");
+            Debug.Assert(!isPatternDispose || needsDisposal);
 
             this.CollectionType = collectionType;
             this.ElementTypeWithAnnotations = elementType;
@@ -81,6 +86,7 @@ internal sealed class ForEachEnumeratorInfo
             this.NeedsDisposal = needsDisposal;
             this.DisposeAwaitableInfo = disposeAwaitableInfo;
             this.DisposeMethod = disposeMethod;
+            this.IsPatternDispose = isPatternDispose;
             this.CollectionConversion = collectionConversion;
             this.CurrentConversion = currentConversion;
             this.EnumeratorConversion = enumeratorConversion;
@@ -103,6 +109,7 @@ internal struct Builder
             public bool NeedsDisposal;
             public BoundAwaitableInfo DisposeAwaitableInfo;
             public MethodSymbol DisposeMethod;
+            public bool IsPatternDispose;
 
             public Conversion CollectionConversion;
             public Conversion CurrentConversion;
@@ -130,6 +137,7 @@ public ForEachEnumeratorInfo Build(BinderFlags location)
                     NeedsDisposal,
                     DisposeAwaitableInfo,
                     DisposeMethod,
+                    IsPatternDispose,
                     CollectionConversion,
                     CurrentConversion,
                     EnumeratorConversion,

diff --git a/src/Compilers/CSharp/Portable/Binder/ForEachLoopBinder.cs b/src/Compilers/CSharp/Portable/Binder/ForEachLoopBinder.cs
@@ -612,7 +612,8 @@ private BoundExpression UnwrapCollectionExpressionIfNullable(BoundExpression col
                     return BoundCall.Synthesized(
                         syntax: exprSyntax,
                         receiverOpt: collectionExpr,
-                        method: nullableValueGetter);
+                        method: nullableValueGetter,
+                        binder: this);
                 }
                 else
                 {
@@ -936,6 +937,7 @@ private void GetDisposalInfoForEnumerator(ref ForEachEnumeratorInfo.Builder buil
                 if (disposeMethod is object)
                 {
                     builder.NeedsDisposal = true;
+                    builder.IsPatternDispose = true;
                     builder.DisposeMethod = disposeMethod;
                 }
                 patternDisposeDiags.Free();

diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundConditionalOperator.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundConditionalOperator.cs
diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundIfStatement.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundIfStatement.cs
diff --git a/src/Compilers/CSharp/Portable/BoundTree/BoundSwitchSection.cs b/src/Compilers/CSharp/Portable/BoundTree/BoundSwitchSection.cs