Merge pull request #6762 from mavasani/LightupCleanup

Cleanup of lightup layer after MS.CA upgrade
dotnet · Jul 13, 2023 · 4fe627a · 4fe627a
2 parents 0d3a2bb + 8d8f5e0
commit 4fe627a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 102 deletions.
diff --git a/...Compiler/Lightup/ITypeSymbolExtensions.cs → ...s/Core/Analyzers/ITypeSymbolExtensions.cs b/...Compiler/Lightup/ITypeSymbolExtensions.cs → ...s/Core/Analyzers/ITypeSymbolExtensions.cs
@@ -12,6 +12,5 @@ private static readonly Func<ITypeSymbol, NullableAnnotation> s_nullableAnnotati
 
         public static NullableAnnotation NullableAnnotation(this ITypeSymbol typeSymbol)
             => s_nullableAnnotation(typeSymbol);
-
     }
 }
diff --git a/...es/Compiler/Lightup/NullableAnnotation.cs → ...zers/Core/Analyzers/NullableAnnotation.cs b/...es/Compiler/Lightup/NullableAnnotation.cs → ...zers/Core/Analyzers/NullableAnnotation.cs
diff --git a/...ities/Compiler/Lightup/NullableContext.cs → ...alyzers/Core/Analyzers/NullableContext.cs b/...ities/Compiler/Lightup/NullableContext.cs → ...alyzers/Core/Analyzers/NullableContext.cs
diff --git a/...iler/Lightup/NullableContextExtensions.cs → ...re/Analyzers/NullableContextExtensions.cs b/...iler/Lightup/NullableContextExtensions.cs → ...re/Analyzers/NullableContextExtensions.cs
diff --git a/src/Utilities/Compiler/Analyzer.Utilities.projitems b/src/Utilities/Compiler/Analyzer.Utilities.projitems
@@ -65,14 +65,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\WellKnownDiagnosticTagsExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Index.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IsExternalInit.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Lightup\INegatedPatternOperationWrapper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Lightup\IOperationWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Lightup\ITypeSymbolExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Lightup\IFunctionPointerInvocationOperationWrapper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Lightup\LightupHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Lightup\NullableAnnotation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Lightup\NullableContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Lightup\NullableContextExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Lightup\OperationKindEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Lightup\OperationWrapperHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Options\MSBuildItemOptionNames.cs" />

diff --git a/src/Utilities/Compiler/Lightup/INegatedPatternOperationWrapper.cs b/src/Utilities/Compiler/Lightup/INegatedPatternOperationWrapper.cs
diff --git a/src/Utilities/Compiler/Lightup/OperationWrapperHelper.cs b/src/Utilities/Compiler/Lightup/OperationWrapperHelper.cs
@@ -14,8 +14,7 @@ internal static class OperationWrapperHelper
         private static readonly Assembly s_codeAnalysisAssembly = typeof(SyntaxNode).GetTypeInfo().Assembly;
 
         private static readonly ImmutableDictionary<Type, Type?> WrappedTypes = ImmutableDictionary.Create<Type, Type?>()
-            .Add(typeof(IFunctionPointerInvocationOperationWrapper), s_codeAnalysisAssembly.GetType(IFunctionPointerInvocationOperationWrapper.WrappedTypeName))
-            .Add(typeof(INegatedPatternOperationWrapper), s_codeAnalysisAssembly.GetType(INegatedPatternOperationWrapper.WrappedTypeName));
+            .Add(typeof(IFunctionPointerInvocationOperationWrapper), s_codeAnalysisAssembly.GetType(IFunctionPointerInvocationOperationWrapper.WrappedTypeName));
 
         /// <summary>
         /// Gets the type that is wrapped by the given wrapper.

diff --git a/...owAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs b/...owAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs
@@ -6,16 +6,13 @@
 using System.Diagnostics;
 using Analyzer.Utilities;
 using Analyzer.Utilities.Extensions;
-using Analyzer.Utilities.Lightup;
 using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis
 {
-    using NullableAnnotation = Analyzer.Utilities.Lightup.NullableAnnotation;
-
     public partial class PointsToAnalysis : ForwardDataFlowAnalysis<PointsToAnalysisData, PointsToAnalysisContext, PointsToAnalysisResult, PointsToBlockAnalysisResult, PointsToAbstractValue>
     {
         /// <summary>
@@ -979,7 +976,7 @@ private static bool IsSpecialFactoryMethodReturningNonNullValue(IMethodSymbol me
             {
                 if (!method.IsStatic ||
                     !method.Name.StartsWith("Create", StringComparison.Ordinal) ||
-                    method.ReturnType.NullableAnnotation() == NullableAnnotation.Annotated)
+                    method.ReturnType.NullableAnnotation == NullableAnnotation.Annotated)
                 {
                     return false;
                 }

diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using Analyzer.Utilities;
 using Analyzer.Utilities.Extensions;
-using Analyzer.Utilities.Lightup;
 using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
@@ -1267,9 +1266,8 @@ private bool TryInferConversion(
                     IPatternOperation patternOperation = isPatternOperation.Pattern;
                     bool direct = true;
 
-                    if (INegatedPatternOperationWrapper.IsInstance(patternOperation))
+                    if (patternOperation is INegatedPatternOperation negatedPattern)
                     {
-                        INegatedPatternOperationWrapper negatedPattern = INegatedPatternOperationWrapper.FromOperation(patternOperation);
                         patternOperation = negatedPattern.Pattern;
                         direct = false;
                     }
@@ -1582,48 +1580,33 @@ private void PerformPredicateAnalysisCore(IOperation operation, TAnalysisData ta
                                 equals: FlowBranchConditionKind == ControlFlowConditionKind.WhenTrue, isReferenceEquality: false, targetAnalysisData: targetAnalysisData);
                             break;
 
-                        default:
-                            // TODO: Remove the below string based checks when we move to Microsoft.CodeAnalysis 3.7 or later.
-                            // TODO: File a tracking bug.
-                            var kindStr = isPatternOperation.Pattern.Kind.ToString();
-                            switch (kindStr)
+                        case OperationKind.NegatedPattern:
+                            var negatedPattern = (INegatedPatternOperation)isPatternOperation.Pattern;
+                            if (negatedPattern.Pattern is IConstantPatternOperation negatedConstantPattern)
                             {
-                                case "NegatedPattern":
-                                    if (isPatternOperation.Pattern.Children.FirstOrDefault() is IPatternOperation negatedPattern)
-                                    {
-                                        if (negatedPattern is IConstantPatternOperation negatedConstantPattern)
-                                        {
-                                            predicateValueKind = SetValueForEqualsOrNotEqualsComparisonOperator(isPatternOperation.Value, negatedConstantPattern.Value,
-                                                equals: FlowBranchConditionKind == ControlFlowConditionKind.WhenFalse, isReferenceEquality: false, targetAnalysisData: targetAnalysisData);
-                                        }
-
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        goto default;
-                                    }
+                                predicateValueKind = SetValueForEqualsOrNotEqualsComparisonOperator(isPatternOperation.Value, negatedConstantPattern.Value,
+                                    equals: FlowBranchConditionKind == ControlFlowConditionKind.WhenFalse, isReferenceEquality: false, targetAnalysisData: targetAnalysisData);
+                            }
 
-                                case "RelationalPattern":
-                                    // For the true branch, set the pattern operation value to NotNull.
-                                    if (FlowBranchConditionKind == ControlFlowConditionKind.WhenTrue)
-                                    {
-                                        predicateValueKind = SetValueForIsNullComparisonOperator(isPatternOperation.Value, equals: false, targetAnalysisData: targetAnalysisData);
-                                    }
+                            break;
 
-                                    break;
+                        case OperationKind.RelationalPattern:
+                            // For the true branch, set the pattern operation value to NotNull.
+                            if (FlowBranchConditionKind == ControlFlowConditionKind.WhenTrue)
+                            {
+                                predicateValueKind = SetValueForIsNullComparisonOperator(isPatternOperation.Value, equals: false, targetAnalysisData: targetAnalysisData);
+                            }
 
-                                case "BinaryPattern":
-                                    // These high level patterns should not be present in the lowered CFG: https://github.com/dotnet/roslyn/issues/47068
-                                    predicateValueKind = PredicateValueKind.Unknown;
-                                    break;
+                            break;
 
-                                default:
-                                    Debug.Fail($"Unknown pattern kind '{isPatternOperation.Pattern.Kind}'");
-                                    predicateValueKind = PredicateValueKind.Unknown;
-                                    break;
-                            }
+                        case OperationKind.BinaryPattern:
+                            // These high level patterns should not be present in the lowered CFG: https://github.com/dotnet/roslyn/issues/47068
+                            predicateValueKind = PredicateValueKind.Unknown;
+                            break;
 
+                        default:
+                            Debug.Fail($"Unknown pattern kind '{isPatternOperation.Pattern.Kind}'");
+                            predicateValueKind = PredicateValueKind.Unknown;
                             break;
                     }