Merge pull request #2494 from calumgrant/cs/roslyn-3.4

hvitved · web-flow · commit 25265bddc785 · 2019-12-09T12:21:30.000+01:00
C#: Upgrade Roslyn to 3.4
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Attribute.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Attribute.cs
@@ -23,6 +23,7 @@ sealed class Attribute : UnlabelledEntity, IAttribute
         public Attribute(Context cx, IEntity @object, CustomAttributeHandle handle) : base(cx)
         {
             attrib = cx.mdReader.GetCustomAttribute(handle);
+            this.handle = handle;
             this.@object = @object;
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -24,7 +24,7 @@ IPropertySymbol PropertySymbol
                 // But for properties/indexers that implement explicit interfaces, Roslyn
                 // does not properly populate `AssociatedSymbol`
                 var props = symbol.ContainingType.GetMembers().OfType<IPropertySymbol>();
-                props = props.Where(p => symbol.Equals(p.GetMethod) || symbol.Equals(p.SetMethod));
+                props = props.Where(p => SymbolEqualityComparer.Default.Equals(symbol, p.GetMethod) || SymbolEqualityComparer.Default.Equals(symbol, p.SetMethod));
                 return props.SingleOrDefault();
             }
         }
@@ -47,12 +47,12 @@ public override void Populate(TextWriter trapFile)
             var parent = Property.Create(Context, prop);
             int kind;
             Accessor unboundAccessor;
-            if (symbol.Equals(prop.GetMethod))
+            if (SymbolEqualityComparer.Default.Equals(symbol, prop.GetMethod))
             {
                 kind = 1;
                 unboundAccessor = Create(Context, prop.OriginalDefinition.GetMethod);
             }
-            else if (symbol.Equals(prop.SetMethod))
+            else if (SymbolEqualityComparer.Default.Equals(symbol, prop.SetMethod))
             {
                 kind = 2;
                 unboundAccessor = Create(Context, prop.OriginalDefinition.SetMethod);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
@@ -20,7 +20,7 @@ public override void Populate(TextWriter trapFile)
 
         static new Destructor OriginalDefinition(Context cx, Destructor original, IMethodSymbol symbol)
         {
-            return symbol.OriginalDefinition == null || Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);
+            return symbol.OriginalDefinition == null || SymbolEqualityComparer.Default.Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);
         }
 
         public new static Destructor Create(Context cx, IMethodSymbol symbol) =>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
@@ -28,12 +28,12 @@ public override void Populate(TextWriter trapFile)
             var parent = Event.Create(Context, @event);
             int kind;
             EventAccessor unboundAccessor;
-            if (symbol.Equals(@event.AddMethod))
+            if (SymbolEqualityComparer.Default.Equals(symbol, @event.AddMethod))
             {
                 kind = 1;
                 unboundAccessor = Create(Context, @event.OriginalDefinition.AddMethod);
             }
-            else if (symbol.Equals(@event.RemoveMethod))
+            else if (SymbolEqualityComparer.Default.Equals(symbol, @event.RemoveMethod))
             {
                 kind = 2;
                 unboundAccessor = Create(Context, @event.OriginalDefinition.RemoveMethod);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
@@ -106,7 +106,7 @@ protected override void PopulateExpression(TextWriter trapFile)
             {
                 var collectionInfo = cx.GetModel(Syntax).GetCollectionInitializerSymbolInfo(i);
                 var addMethod = Method.Create(cx, collectionInfo.Symbol as IMethodSymbol);
-                var voidType = Entities.Type.Create(cx, new AnnotatedTypeSymbol(cx.Compilation.GetSpecialType(SpecialType.System_Void), NullableAnnotation.NotApplicable));
+                var voidType = Entities.Type.Create(cx, new AnnotatedTypeSymbol(cx.Compilation.GetSpecialType(SpecialType.System_Void), NullableAnnotation.None));
 
                 var invocation = new Expression(new ExpressionInfo(cx, voidType, cx.Create(i.GetLocation()), ExprKind.METHOD_INVOCATION, this, child++, false, null));
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -40,7 +40,7 @@ protected void PopulateParameters(TextWriter trapFile)
 
             foreach (var p in parameters.Zip(originalParameters, (paramSymbol, originalParam) => new { paramSymbol, originalParam }))
             {
-                var original = Equals(p.paramSymbol, p.originalParam) ? null : Parameter.Create(Context, p.originalParam, originalMethod);
+                var original = SymbolEqualityComparer.Default.Equals(p.paramSymbol, p.originalParam) ? null : Parameter.Create(Context, p.originalParam, originalMethod);
                 Parameter.Create(Context, p.paramSymbol, this, original);
             }
 
@@ -117,7 +117,7 @@ protected static void BuildMethodId(Method m, TextWriter trapFile)
 
             if (m.symbol.IsGenericMethod)
             {
-                if (Equals(m.symbol, m.symbol.OriginalDefinition))
+                if (SymbolEqualityComparer.Default.Equals(m.symbol, m.symbol.OriginalDefinition))
                 {
                     trapFile.Write('`');
                     trapFile.Write(m.symbol.TypeParameters.Length);
@@ -318,7 +318,7 @@ public static Method Create(Context cx, IMethodSymbol methodDecl)
         /// <summary>
         /// Whether this method has unbound type parameters.
         /// </summary>
-        public bool IsUnboundGeneric => IsGeneric && Equals(symbol.ConstructedFrom, symbol);
+        public bool IsUnboundGeneric => IsGeneric && SymbolEqualityComparer.Default.Equals(symbol.ConstructedFrom, symbol);
 
         public bool IsBoundGeneric => IsGeneric && !IsUnboundGeneric;
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
@@ -272,7 +272,7 @@ public override bool Equals(object obj)
             if (other == null || other.GetType() != typeof(ConstructedExtensionParameter))
                 return false;
 
-            return Equals(symbol, other.symbol) && Equals(ConstructedType, other.ConstructedType);
+            return SymbolEqualityComparer.Default.Equals(symbol, other.symbol) && SymbolEqualityComparer.Default.Equals(ConstructedType, other.ConstructedType);
         }
 
         public static ConstructedExtensionParameter Create(Context cx, Method method, Parameter parameter) =>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
@@ -32,7 +32,7 @@ public static Nullability Create(AnnotatedTypeSymbol ts)
 
         public bool IsOblivious => Annotation == 0 && NullableParameters.Length == 0;
 
-        static readonly Nullability oblivious = new Nullability(NullableAnnotation.Disabled);
+        static readonly Nullability oblivious = new Nullability(NullableAnnotation.None);
         static readonly Nullability annotated = new Nullability(NullableAnnotation.Annotated);
         static readonly Nullability notannotated = new Nullability(NullableAnnotation.NotAnnotated);
 
@@ -244,14 +244,14 @@ public static AnnotatedTypeSymbol GetAnnotatedElementType(this IArrayTypeSymbol
         /// This has not yet been exposed on the public API.
         /// </summary>
         public static IEnumerable<AnnotatedTypeSymbol> GetAnnotatedTypeArguments(this INamedTypeSymbol symbol) =>
-            symbol.TypeArguments.Zip(symbol.TypeArgumentsNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
+            symbol.TypeArguments.Zip(symbol.TypeArgumentNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
 
         /// <summary>
         /// Gets the annotated type arguments of an IMethodSymbol.
         /// This has not yet been exposed on the public API.
         /// </summary>
         public static IEnumerable<AnnotatedTypeSymbol> GetAnnotatedTypeArguments(this IMethodSymbol symbol) =>
-            symbol.TypeArguments.Zip(symbol.TypeArgumentsNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
+            symbol.TypeArguments.Zip(symbol.TypeArgumentNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
 
         /// <summary>
         /// Gets the annotated type constraints of an ITypeParameterSymbol.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -36,7 +36,7 @@ public Type(Context cx, ITypeSymbol init)
 
         public static bool ConstructedOrParentIsConstructed(INamedTypeSymbol symbol)
         {
-            return !Equals(symbol, symbol.OriginalDefinition) ||
+            return !SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) ||
                 symbol.ContainingType != null && ConstructedOrParentIsConstructed(symbol.ContainingType);
         }
 
@@ -155,7 +155,7 @@ protected void PopulateType(TextWriter trapFile)
                 {
                     var param = invokeMethod.Parameters[i];
                     var originalParam = invokeMethod.OriginalDefinition.Parameters[i];
-                    var originalParamEntity = Equals(param, originalParam) ? null :
+                    var originalParamEntity = SymbolEqualityComparer.Default.Equals(param, originalParam) ? null :
                         DelegateTypeParameter.Create(Context, originalParam, Create(Context, ((INamedTypeSymbol)symbol).OriginalDefinition));
                     DelegateTypeParameter.Create(Context, param, this, originalParamEntity);
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj b/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs
@@ -115,7 +115,7 @@ public static bool ContainsTypeParameters(this ITypeSymbol type, Context cx, ISy
                     case TypeKind.TypeParameter:
                         var tp = (ITypeParameterSymbol)type;
                         var declaringGen = tp.TypeParameterKind == TypeParameterKind.Method ? tp.DeclaringMethod : (ISymbol)tp.DeclaringType;
-                        return Equals(declaringGen, declaringGeneric);
+                        return SymbolEqualityComparer.Default.Equals(declaringGen, declaringGeneric);
                     default:
                         return false;
                 }
@@ -373,7 +373,7 @@ public static void BuildNamedTypeDisplayName(this INamedTypeSymbol namedType, Co
         }
 
         public static bool IsReallyUnbound(this INamedTypeSymbol type) =>
-            Equals(type.ConstructedFrom, type) || type.IsUnboundGenericType;
+            SymbolEqualityComparer.Default.Equals(type.ConstructedFrom, type) || type.IsUnboundGenericType;
 
         public static bool IsReallyBound(this INamedTypeSymbol type) => !IsReallyUnbound(type);
 
@@ -413,13 +413,13 @@ public static IEnumerable<IParameterSymbol> GetParameters(this ISymbol parameter
         /// <summary>
         /// Holds if this symbol is a source declaration.
         /// </summary>
-        public static bool IsSourceDeclaration(this ISymbol symbol) => Equals(symbol, symbol.OriginalDefinition);
+        public static bool IsSourceDeclaration(this ISymbol symbol) => SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition);
 
         /// <summary>
         /// Holds if this method is a source declaration.
         /// </summary>
         public static bool IsSourceDeclaration(this IMethodSymbol method) =>
-            IsSourceDeclaration((ISymbol)method) && Equals(method, method.ConstructedFrom) && method.ReducedFrom == null;
+            IsSourceDeclaration((ISymbol)method) && SymbolEqualityComparer.Default.Equals(method, method.ConstructedFrom) && method.ReducedFrom == null;
 
         /// <summary>
         /// Holds if this parameter is a source declaration.
@@ -477,6 +477,6 @@ public static AnnotatedTypeSymbol GetType(this Context cx, Microsoft.CodeAnalysi
         /// This has not yet been exposed on the public API.
         /// </summary>
         public static IEnumerable<AnnotatedTypeSymbol> GetAnnotatedTypeArguments(this INamedTypeSymbol symbol) =>
-            symbol.TypeArguments.Zip(symbol.TypeArgumentsNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
+            symbol.TypeArguments.Zip(symbol.TypeArgumentNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction/Context.cs b/csharp/extractor/Semmle.Extraction/Context.cs
@@ -282,7 +282,9 @@ public Context(IExtractor e, Compilation c, TrapWriter trapWriter, IExtractionSc
         ///     of the symbol is a constructed generic.
         /// </summary>
         /// <param name="symbol">The symbol to populate.</param>
-        public bool Defines(ISymbol symbol) => !Equals(symbol, symbol.OriginalDefinition) || Scope.InScope(symbol);
+        public bool Defines(ISymbol symbol) =>
+            !SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) ||
+            Scope.InScope(symbol);
 
         /// <summary>
         /// Whether the current extraction context defines a given file.
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction/Entities/Assembly.cs
@@ -36,7 +36,7 @@ public override void Populate(TextWriter trapFile)
         }
 
         public override bool NeedsPopulation =>
-            !Equals(assembly, Context.Compilation.Assembly) || !Context.IsGlobalContext;
+            !SymbolEqualityComparer.Default.Equals(assembly, Context.Compilation.Assembly) || !Context.IsGlobalContext;
 
         public override int GetHashCode() =>
             symbol == null ? 91187354 : symbol.GetHashCode();
diff --git a/csharp/extractor/Semmle.Extraction/ExtractionScope.cs b/csharp/extractor/Semmle.Extraction/ExtractionScope.cs
@@ -46,7 +46,9 @@ public AssemblyScope(IAssemblySymbol symbol, string path, bool isOutput)
 
         public bool InFileScope(string path) => path == filepath;
 
-        public bool InScope(ISymbol symbol) => Equals(symbol.ContainingAssembly, assembly) || Equals(symbol, assembly);
+        public bool InScope(ISymbol symbol) =>
+            SymbolEqualityComparer.Default.Equals(symbol.ContainingAssembly, assembly) ||
+            SymbolEqualityComparer.Default.Equals(symbol, assembly);
     }
 
     /// <summary>
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.4.0" />
     <PackageReference Include="GitInfo" Version="2.0.20"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 <PrivateAssets>all</PrivateAssets>
 </PackageReference>
diff --git a/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected b/csharp/ql/test/library-tests/controlflow/guards/AbstractValue.expected
@@ -119,6 +119,14 @@ abstractValue
 | non-null | Collections.cs:67:19:67:21 | "a" |
 | non-null | Collections.cs:68:19:68:21 | "b" |
 | non-null | Collections.cs:74:40:74:41 | "" |
+| non-null | Collections.cs:75:26:75:32 | this access |
+| non-null | Collections.cs:76:24:76:30 | this access |
+| non-null | Collections.cs:77:24:77:30 | this access |
+| non-null | Collections.cs:78:24:78:30 | this access |
+| non-null | Collections.cs:79:24:79:30 | this access |
+| non-null | Collections.cs:80:24:80:30 | this access |
+| non-null | Collections.cs:81:24:81:30 | this access |
+| non-null | Collections.cs:82:24:82:30 | this access |
 | non-null | Collections.cs:87:17:87:31 | array creation of type String[] |
 | non-null | Collections.cs:88:22:88:23 | array creation of type String[] |
 | non-null | Collections.cs:89:9:89:32 | ... = ... |
diff --git a/csharp/ql/test/library-tests/conversion/operator/Operator.expected b/csharp/ql/test/library-tests/conversion/operator/Operator.expected
@@ -1,7 +1,7 @@
-| ArraySegment<T> | Memory<T> |
-| ArraySegment<T> | ReadOnlyMemory<T> |
-| ArraySegment<T> | ReadOnlySpan<T> |
-| ArraySegment<T> | Span<T> |
+| ArraySegment<T> | Memory<> |
+| ArraySegment<T> | ReadOnlyMemory<> |
+| ArraySegment<T> | ReadOnlySpan<> |
+| ArraySegment<T> | Span<> |
 | Byte | Decimal |
 | Char | Decimal |
 | Char | StandardFormat |
@@ -12,17 +12,17 @@
 | Int32 | Index |
 | Int32 | MetadataToken |
 | Int64 | Decimal |
-| Memory<T> | ReadOnlyMemory<T> |
+| Memory<> | ReadOnlyMemory<T> |
 | MetadataToken | Int32 |
 | SByte | Decimal |
-| Span<T> | ReadOnlySpan<T> |
+| Span<> | ReadOnlySpan<T> |
 | String | ReadOnlySpan<Char> |
 | T | Nullable<> |
-| T[] | ArraySegment<T> |
-| T[] | Memory<T> |
-| T[] | ReadOnlyMemory<T> |
-| T[] | ReadOnlySpan<T> |
-| T[] | Span<T> |
+| T[] | ArraySegment<> |
+| T[] | Memory<> |
+| T[] | ReadOnlyMemory<> |
+| T[] | ReadOnlySpan<> |
+| T[] | Span<> |
 | UInt16 | Decimal |
 | UInt32 | Decimal |
 | UInt64 | Decimal |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
@@ -116,16 +116,19 @@
 | CSharp7.cs:118:9:118:10 | access to local variable m2 | CSharp7.cs:119:19:119:20 | access to local variable m2 |
 | CSharp7.cs:119:19:119:20 | access to local variable m2 | CSharp7.cs:119:19:119:26 | access to field Item1 |
 | CSharp7.cs:123:28:123:36 | "DefUse3" | CSharp7.cs:123:22:123:36 | ... = ... |
+| CSharp7.cs:129:9:129:12 | this | CSharp7.cs:135:24:135:25 | this access |
 | CSharp7.cs:131:20:131:20 | x | CSharp7.cs:131:20:131:20 | x |
 | CSharp7.cs:131:20:131:20 | x | CSharp7.cs:131:32:131:32 | access to parameter x |
 | CSharp7.cs:131:32:131:32 | access to parameter x | CSharp7.cs:131:32:131:36 | ... + ... |
 | CSharp7.cs:131:36:131:36 | 1 | CSharp7.cs:131:32:131:36 | ... + ... |
 | CSharp7.cs:133:22:133:22 | t | CSharp7.cs:133:22:133:22 | t |
 | CSharp7.cs:133:22:133:22 | t | CSharp7.cs:133:39:133:39 | access to parameter t |
+| CSharp7.cs:135:24:135:25 | this access | CSharp7.cs:155:16:155:17 | this access |
 | CSharp7.cs:139:29:139:29 | x | CSharp7.cs:139:29:139:29 | x |
 | CSharp7.cs:139:29:139:29 | x | CSharp7.cs:139:34:139:34 | access to parameter x |
 | CSharp7.cs:139:34:139:34 | access to parameter x | CSharp7.cs:139:34:139:38 | ... + ... |
 | CSharp7.cs:139:38:139:38 | 1 | CSharp7.cs:139:34:139:38 | ... + ... |
+| CSharp7.cs:141:9:141:51 | this | CSharp7.cs:141:38:141:39 | this access |
 | CSharp7.cs:141:20:141:20 | x | CSharp7.cs:141:20:141:20 | x |
 | CSharp7.cs:141:20:141:20 | x | CSharp7.cs:141:26:141:26 | access to parameter x |
 | CSharp7.cs:141:26:141:26 | access to parameter x | CSharp7.cs:141:26:141:30 | ... > ... |
@@ -135,16 +138,26 @@
 | CSharp7.cs:141:34:141:46 | ... + ... | CSharp7.cs:141:26:141:50 | ... ? ... : ... |
 | CSharp7.cs:141:38:141:46 | call to local function f7 | CSharp7.cs:141:34:141:46 | ... + ... |
 | CSharp7.cs:141:50:141:50 | 0 | CSharp7.cs:141:26:141:50 | ... ? ... : ... |
+| CSharp7.cs:143:9:143:31 | this | CSharp7.cs:143:26:143:27 | this access |
 | CSharp7.cs:143:20:143:20 | x | CSharp7.cs:143:20:143:20 | x |
 | CSharp7.cs:143:20:143:20 | x | CSharp7.cs:143:29:143:29 | access to parameter x |
+| CSharp7.cs:145:9:149:9 | this | CSharp7.cs:148:20:148:21 | this access |
+| CSharp7.cs:147:13:147:35 | this | CSharp7.cs:147:30:147:31 | this access |
 | CSharp7.cs:147:24:147:24 | x | CSharp7.cs:147:24:147:24 | x |
 | CSharp7.cs:147:24:147:24 | x | CSharp7.cs:147:33:147:33 | access to parameter x |
+| CSharp7.cs:158:10:158:17 | this | CSharp7.cs:170:9:170:9 | this access |
 | CSharp7.cs:161:18:161:18 | t | CSharp7.cs:161:18:161:18 | t |
 | CSharp7.cs:161:18:161:18 | t | CSharp7.cs:161:24:161:24 | access to parameter t |
+| CSharp7.cs:163:9:168:9 | this | CSharp7.cs:166:13:166:16 | this access |
 | CSharp7.cs:163:26:163:26 | u | CSharp7.cs:163:26:163:26 | u |
 | CSharp7.cs:163:26:163:26 | u | CSharp7.cs:167:22:167:22 | access to parameter u |
+| CSharp7.cs:165:13:165:43 | this | CSharp7.cs:165:37:165:40 | this access |
+| CSharp7.cs:166:13:166:16 | this access | CSharp7.cs:167:20:167:20 | this access |
+| CSharp7.cs:170:9:170:9 | this access | CSharp7.cs:171:9:171:9 | this access |
+| CSharp7.cs:174:10:174:19 | this | CSharp7.cs:181:21:181:21 | this access |
 | CSharp7.cs:176:16:176:30 | SSA def(src) | CSharp7.cs:181:23:181:25 | access to local variable src |
 | CSharp7.cs:176:22:176:30 | "tainted" | CSharp7.cs:176:16:176:30 | SSA def(src) |
+| CSharp7.cs:177:9:177:40 | this | CSharp7.cs:177:31:177:31 | this access |
 | CSharp7.cs:177:25:177:25 | s | CSharp7.cs:177:25:177:25 | s |
 | CSharp7.cs:177:25:177:25 | s | CSharp7.cs:177:33:177:33 | access to parameter s |
 | CSharp7.cs:177:31:177:34 | call to local function g | CSharp7.cs:177:31:177:39 | ... + ... |
@@ -153,8 +166,10 @@
 | CSharp7.cs:178:25:178:25 | s | CSharp7.cs:178:31:178:31 | access to parameter s |
 | CSharp7.cs:179:25:179:25 | s | CSharp7.cs:179:25:179:25 | s |
 | CSharp7.cs:179:25:179:25 | s | CSharp7.cs:179:37:179:37 | access to parameter s |
+| CSharp7.cs:181:21:181:21 | this access | CSharp7.cs:182:21:182:21 | this access |
 | CSharp7.cs:181:23:181:25 | [post] access to local variable src | CSharp7.cs:182:23:182:25 | access to local variable src |
 | CSharp7.cs:181:23:181:25 | access to local variable src | CSharp7.cs:182:23:182:25 | access to local variable src |
+| CSharp7.cs:182:21:182:21 | this access | CSharp7.cs:183:21:183:21 | this access |
 | CSharp7.cs:182:23:182:25 | [post] access to local variable src | CSharp7.cs:183:23:183:25 | access to local variable src |
 | CSharp7.cs:182:23:182:25 | access to local variable src | CSharp7.cs:183:23:183:25 | access to local variable src |
 | CSharp7.cs:189:10:189:11 | this | CSharp7.cs:198:14:198:23 | this access |
diff --git a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.cs b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.cs
diff --git a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected
diff --git a/csharp/ql/test/library-tests/dataflow/global/DataFlowEdges.expected b/csharp/ql/test/library-tests/dataflow/global/DataFlowEdges.expected
diff --git a/csharp/ql/test/library-tests/dataflow/global/TaintTrackingEdges.expected b/csharp/ql/test/library-tests/dataflow/global/TaintTrackingEdges.expected
diff --git a/csharp/ql/test/library-tests/dataflow/library/LibraryTypeDataFlow.expected b/csharp/ql/test/library-tests/dataflow/library/LibraryTypeDataFlow.expected
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
diff --git a/csharp/ql/test/library-tests/expressions/QualifiableExpr.expected b/csharp/ql/test/library-tests/expressions/QualifiableExpr.expected

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ sealed class Attribute : UnlabelledEntity, IAttribute`
`23`	`23`	`public Attribute(Context cx, IEntity @object, CustomAttributeHandle handle) : base(cx)`
`24`	`24`	`{`
`25`	`25`	`attrib = cx.mdReader.GetCustomAttribute(handle);`
	`26`	`+ this.handle = handle;`
`26`	`27`	`this.@object = @object;`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ IPropertySymbol PropertySymbol`
`24`	`24`	`// But for properties/indexers that implement explicit interfaces, Roslyn`
`25`	`25`	// does not properly populate `AssociatedSymbol`
`26`	`26`	`var props = symbol.ContainingType.GetMembers().OfType<IPropertySymbol>();`
`27`		`- props = props.Where(p => symbol.Equals(p.GetMethod) \|\| symbol.Equals(p.SetMethod));`
	`27`	`+ props = props.Where(p => SymbolEqualityComparer.Default.Equals(symbol, p.GetMethod) \|\| SymbolEqualityComparer.Default.Equals(symbol, p.SetMethod));`
`28`	`28`	`return props.SingleOrDefault();`
`29`	`29`	`}`
`30`	`30`	`}`
`@@ -47,12 +47,12 @@ public override void Populate(TextWriter trapFile)`
`47`	`47`	`var parent = Property.Create(Context, prop);`
`48`	`48`	`int kind;`
`49`	`49`	`Accessor unboundAccessor;`
`50`		`- if (symbol.Equals(prop.GetMethod))`
	`50`	`+ if (SymbolEqualityComparer.Default.Equals(symbol, prop.GetMethod))`
`51`	`51`	`{`
`52`	`52`	`kind = 1;`
`53`	`53`	`unboundAccessor = Create(Context, prop.OriginalDefinition.GetMethod);`
`54`	`54`	`}`
`55`		`- else if (symbol.Equals(prop.SetMethod))`
	`55`	`+ else if (SymbolEqualityComparer.Default.Equals(symbol, prop.SetMethod))`
`56`	`56`	`{`
`57`	`57`	`kind = 2;`
`58`	`58`	`unboundAccessor = Create(Context, prop.OriginalDefinition.SetMethod);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public override void Populate(TextWriter trapFile)`
`20`	`20`
`21`	`21`	`static new Destructor OriginalDefinition(Context cx, Destructor original, IMethodSymbol symbol)`
`22`	`22`	`{`
`23`		`- return symbol.OriginalDefinition == null \|\| Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);`
	`23`	`+ return symbol.OriginalDefinition == null \|\| SymbolEqualityComparer.Default.Equals(symbol.OriginalDefinition, symbol) ? original : Create(cx, symbol.OriginalDefinition);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public new static Destructor Create(Context cx, IMethodSymbol symbol) =>`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ public override void Populate(TextWriter trapFile)`
`28`	`28`	`var parent = Event.Create(Context, @event);`
`29`	`29`	`int kind;`
`30`	`30`	`EventAccessor unboundAccessor;`
`31`		`- if (symbol.Equals(@event.AddMethod))`
	`31`	`+ if (SymbolEqualityComparer.Default.Equals(symbol, @event.AddMethod))`
`32`	`32`	`{`
`33`	`33`	`kind = 1;`
`34`	`34`	`unboundAccessor = Create(Context, @event.OriginalDefinition.AddMethod);`
`35`	`35`	`}`
`36`		`- else if (symbol.Equals(@event.RemoveMethod))`
	`36`	`+ else if (SymbolEqualityComparer.Default.Equals(symbol, @event.RemoveMethod))`
`37`	`37`	`{`
`38`	`38`	`kind = 2;`
`39`	`39`	`unboundAccessor = Create(Context, @event.OriginalDefinition.RemoveMethod);`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected override void PopulateExpression(TextWriter trapFile)`
`106`	`106`	`{`
`107`	`107`	`var collectionInfo = cx.GetModel(Syntax).GetCollectionInitializerSymbolInfo(i);`
`108`	`108`	`var addMethod = Method.Create(cx, collectionInfo.Symbol as IMethodSymbol);`
`109`		`- var voidType = Entities.Type.Create(cx, new AnnotatedTypeSymbol(cx.Compilation.GetSpecialType(SpecialType.System_Void), NullableAnnotation.NotApplicable));`
	`109`	`+ var voidType = Entities.Type.Create(cx, new AnnotatedTypeSymbol(cx.Compilation.GetSpecialType(SpecialType.System_Void), NullableAnnotation.None));`
`110`	`110`
`111`	`111`	`var invocation = new Expression(new ExpressionInfo(cx, voidType, cx.Create(i.GetLocation()), ExprKind.METHOD_INVOCATION, this, child++, false, null));`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected void PopulateParameters(TextWriter trapFile)`
`40`	`40`
`41`	`41`	`foreach (var p in parameters.Zip(originalParameters, (paramSymbol, originalParam) => new { paramSymbol, originalParam }))`
`42`	`42`	`{`
`43`		`- var original = Equals(p.paramSymbol, p.originalParam) ? null : Parameter.Create(Context, p.originalParam, originalMethod);`
	`43`	`+ var original = SymbolEqualityComparer.Default.Equals(p.paramSymbol, p.originalParam) ? null : Parameter.Create(Context, p.originalParam, originalMethod);`
`44`	`44`	`Parameter.Create(Context, p.paramSymbol, this, original);`
`45`	`45`	`}`
`46`	`46`
`@@ -117,7 +117,7 @@ protected static void BuildMethodId(Method m, TextWriter trapFile)`
`117`	`117`
`118`	`118`	`if (m.symbol.IsGenericMethod)`
`119`	`119`	`{`
`120`		`- if (Equals(m.symbol, m.symbol.OriginalDefinition))`
	`120`	`+ if (SymbolEqualityComparer.Default.Equals(m.symbol, m.symbol.OriginalDefinition))`
`121`	`121`	`{`
`122`	`122`	trapFile.Write('`');
`123`	`123`	`trapFile.Write(m.symbol.TypeParameters.Length);`
`@@ -318,7 +318,7 @@ public static Method Create(Context cx, IMethodSymbol methodDecl)`
`318`	`318`	`/// <summary>`
`319`	`319`	`/// Whether this method has unbound type parameters.`
`320`	`320`	`/// </summary>`
`321`		`- public bool IsUnboundGeneric => IsGeneric && Equals(symbol.ConstructedFrom, symbol);`
	`321`	`+ public bool IsUnboundGeneric => IsGeneric && SymbolEqualityComparer.Default.Equals(symbol.ConstructedFrom, symbol);`
`322`	`322`
`323`	`323`	`public bool IsBoundGeneric => IsGeneric && !IsUnboundGeneric;`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public override bool Equals(object obj)`
`272`	`272`	`if (other == null \|\| other.GetType() != typeof(ConstructedExtensionParameter))`
`273`	`273`	`return false;`
`274`	`274`
`275`		`- return Equals(symbol, other.symbol) && Equals(ConstructedType, other.ConstructedType);`
	`275`	`+ return SymbolEqualityComparer.Default.Equals(symbol, other.symbol) && SymbolEqualityComparer.Default.Equals(ConstructedType, other.ConstructedType);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`public static ConstructedExtensionParameter Create(Context cx, Method method, Parameter parameter) =>`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public Type(Context cx, ITypeSymbol init)`
`36`	`36`
`37`	`37`	`public static bool ConstructedOrParentIsConstructed(INamedTypeSymbol symbol)`
`38`	`38`	`{`
`39`		`- return !Equals(symbol, symbol.OriginalDefinition) \|\|`
	`39`	`+ return !SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) \|\|`
`40`	`40`	`symbol.ContainingType != null && ConstructedOrParentIsConstructed(symbol.ContainingType);`
`41`	`41`	`}`
`42`	`42`
`@@ -155,7 +155,7 @@ protected void PopulateType(TextWriter trapFile)`
`155`	`155`	`{`
`156`	`156`	`var param = invokeMethod.Parameters[i];`
`157`	`157`	`var originalParam = invokeMethod.OriginalDefinition.Parameters[i];`
`158`		`- var originalParamEntity = Equals(param, originalParam) ? null :`
	`158`	`+ var originalParamEntity = SymbolEqualityComparer.Default.Equals(param, originalParam) ? null :`
`159`	`159`	`DelegateTypeParameter.Create(Context, originalParam, Create(Context, ((INamedTypeSymbol)symbol).OriginalDefinition));`
`160`	`160`	`DelegateTypeParameter.Create(Context, param, this, originalParamEntity);`
`161`	`161`	`}`