C#: Fix label conflicts.

C#: Remove unnecessary code from Property.

Author: calumgrant

csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs

@@ -58,7 +58,7 @@ public override void Populate()
             }
             else
             {
-                Context.ModelError(symbol, "Undhandled accessor kind");
+                Context.ModelError(symbol, "Unhandled accessor kind");
                 return;
             }
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs

@@ -118,7 +118,7 @@ public override IId Id
                     if (symbol.IsStatic) tb.Append("static");
                     tb.Append(ContainingType);
                     AddParametersToId(Context, tb, symbol);
-                    tb.Append("; constructor");
+                    tb.Append(";constructor");
                 });
             }
         }

csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs

@@ -30,11 +30,12 @@ public override void Populate()
             Context.Emit(Tuples.events(this, symbol.GetName(), ContainingType, type.TypeRef, Create(Context, symbol.OriginalDefinition)));
 
             var adder = symbol.AddMethod;
-            if (adder != null)
+            var remover = symbol.RemoveMethod;
+
+            if (!(adder is null))
                 EventAccessor.Create(Context, adder);
 
-            var remover = symbol.RemoveMethod;
-            if (remover != null)
+            if (!(remover is null))
                 EventAccessor.Create(Context, remover);
 
             ExtractModifiers();

csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs

@@ -21,45 +21,21 @@ public override void Populate()
             var getter = symbol.GetMethod;
             var setter = symbol.SetMethod;
 
-            if (getter == null && setter == null)
+            if (getter is null && setter is null)
                 Context.ModelError(symbol, "No indexer accessor defined");
 
-            if (getter != null)
-            {
-                Getter = Accessor.Create(Context, getter);
-            }
+            if (!(getter is null))
+                Method.Create(Context, getter);
 
-            if (setter != null)
-            {
-                Setter = Accessor.Create(Context, setter);
-            }
+            if (!(setter is null))
+                Method.Create(Context, setter);
 
             for (var i = 0; i < symbol.Parameters.Length; ++i)
             {
                 var original = Parameter.Create(Context, symbol.OriginalDefinition.Parameters[i], OriginalDefinition);
                 Parameter.Create(Context, symbol.Parameters[i], this, original);
             }
 
-            if (getter != null)
-            {
-                Getter = Accessor.Create(Context, getter);
-                Context.Emit(Tuples.accessors(Getter, 1, getter.Name, this, Getter.OriginalDefinition));
-
-                Context.Emit(Tuples.accessor_location(Getter, Getter.Location));
-                Getter.Overrides();
-                Getter.ExtractModifiers();
-            }
-
-            if (setter != null)
-            {
-                Setter = Accessor.Create(Context, setter);
-                Context.Emit(Tuples.accessors(Setter, 2, setter.Name, this, Setter.OriginalDefinition));
-
-                Context.Emit(Tuples.accessor_location(Setter, Setter.Location));
-                Setter.Overrides();
-                Setter.ExtractModifiers();
-            }
-
             if (IsSourceDeclaration)
             {
                 var expressionBody = ExpressionBody;

csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs

@@ -256,21 +256,28 @@ public static Method Create(Context cx, IMethodSymbol methodDecl)
         {
             if (methodDecl == null) return null;
 
-            switch (methodDecl.MethodKind)
+            var methodKind = methodDecl.MethodKind;
+
+            if(methodKind == MethodKind.ExplicitInterfaceImplementation)
+            {
+                // Retrieve the original method kind
+                methodKind = methodDecl.ExplicitInterfaceImplementations.Select(m => m.MethodKind).FirstOrDefault();
+            }
+
+            switch (methodKind)
             {
                 case MethodKind.StaticConstructor:
                 case MethodKind.Constructor:
                     return Constructor.Create(cx, methodDecl);
                 case MethodKind.ReducedExtension:
                 case MethodKind.Ordinary:
                 case MethodKind.DelegateInvoke:
-                case MethodKind.ExplicitInterfaceImplementation:
                     return OrdinaryMethod.Create(cx, methodDecl);
                 case MethodKind.Destructor:
                     return Destructor.Create(cx, methodDecl);
                 case MethodKind.PropertyGet:
                 case MethodKind.PropertySet:
-                    return Accessor.Create(cx, methodDecl);
+                    return methodDecl.AssociatedSymbol is null ? OrdinaryMethod.Create(cx, methodDecl) : (Method)Accessor.Create(cx, methodDecl);
                 case MethodKind.EventAdd:
                 case MethodKind.EventRemove:
                     return EventAccessor.Create(cx, methodDecl);

csharp/extractor/Semmle.Extraction.CSharp/Entities/Namespace.cs

@@ -2,7 +2,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    class Namespace : CachedEntity<INamespaceSymbol>
+    sealed class Namespace : CachedEntity<INamespaceSymbol>
     {
         Namespace(Context cx, INamespaceSymbol init)
             : base(cx, init) { }
@@ -41,5 +41,14 @@ class NamespaceFactory : ICachedEntityFactory<INamespaceSymbol, Namespace>
         }
 
         public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.NoLabel;
+
+        public override int GetHashCode() => QualifiedName.GetHashCode();
+
+        string QualifiedName => symbol.ToDisplayString();
+
+        public override bool Equals(object obj)
+        {
+            return obj is Namespace ns && QualifiedName == ns.QualifiedName;
+        }
     }
 }

csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs

@@ -24,9 +24,6 @@ public override IId Id
             }
         }
 
-        protected Accessor Getter { get; set; }
-        protected Accessor Setter { get; set; }
-
         public override void Populate()
         {
             ExtractAttributes();
@@ -37,12 +34,13 @@ public override void Populate()
             Context.Emit(Tuples.properties(this, symbol.GetName(), ContainingType, type.TypeRef, Create(Context, symbol.OriginalDefinition)));
 
             var getter = symbol.GetMethod;
-            if (getter != null)
-                Getter = Accessor.Create(Context, getter);
-
             var setter = symbol.SetMethod;
-            if (setter != null)
-                Setter = Accessor.Create(Context, setter);
+
+            if (!(getter is null))
+                Method.Create(Context, getter);
+
+            if (!(setter is null))
+                Method.Create(Context, setter);
 
             var declSyntaxReferences = IsSourceDeclaration ?
                 symbol.DeclaringSyntaxReferences.
@@ -100,7 +98,9 @@ public override Microsoft.CodeAnalysis.Location FullLocation
 
         public static Property Create(Context cx, IPropertySymbol prop)
         {
-            return prop.IsIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntity(cx, prop);
+            bool isIndexer = prop.IsIndexer || prop.ExplicitInterfaceImplementations.Any(e => e.IsIndexer);
+
+            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntity(cx, prop);
         }
 
         public void VisitDeclaration(Context cx, PropertyDeclarationSyntax p)

csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs

@@ -157,7 +157,7 @@ protected void ExtractType()
                     var param = invokeMethod.Parameters[i];
                     var originalParam = invokeMethod.OriginalDefinition.Parameters[i];
                     var originalParamEntity = Equals(param, originalParam) ? null :
-                        DelegateTypeParameter.Create(Context, originalParam, Create(Context, ((INamedTypeSymbol)symbol).ConstructedFrom));
+                        DelegateTypeParameter.Create(Context, originalParam, Create(Context, ((INamedTypeSymbol)symbol).OriginalDefinition));
                     DelegateTypeParameter.Create(Context, param, this, originalParamEntity);
                 }
 

csharp/extractor/Semmle.Extraction/Context.cs

@@ -57,23 +57,22 @@ public bool GetOrAddCachedLabel(ICachedEntity entity)
                 return true;
             }
 
-            var id = entity.Id;
+            entity.Label = label = new Label(NewId());
+            entityLabelCache[entity] = label;
 
-            if (id == null)
-                throw new InternalError("Attempt to create a null entity for {0}", entity.GetType());
+            var id = entity.Id;
+            DefineLabel(label, id);
 
-            // Look up the Id in the idLabelCache
-            if (idLabelCache.TryGetValue(id, out label))
+#if DEBUG_LABELS
+            if (idLabelCache.TryGetValue(id, out var originalEntity))
             {
-                entity.Label = label;
-                entityLabelCache[entity] = label;
-                return true;
+                Extractor.Message(new Message { message = "Label collision for " + id.ToString(), severity = Severity.Warning });
             }
-
-            entity.Label = label = new Label(NewId());
-            DefineLabel(label, id);
-            entityLabelCache[entity] = label;
-            idLabelCache[id] = label;
+            else
+            {
+                idLabelCache[id] = entity;
+            }
+#endif
             return false;
         }
 
@@ -111,7 +110,7 @@ public void AddFreshLabel(IEntity entity)
             entity.Label = label;
         }
 
-        readonly Dictionary<IId, Label> idLabelCache = new Dictionary<IId, Label>();
+        readonly Dictionary<IId, ICachedEntity> idLabelCache = new Dictionary<IId, ICachedEntity>();
         readonly Dictionary<ICachedEntity, Label> entityLabelCache = new Dictionary<ICachedEntity, Label>();
         readonly HashSet<Label> extractedGenerics = new HashSet<Label>();
 

csharp/extractor/Semmle.Extraction/Entities/Assembly.cs

@@ -69,8 +69,8 @@ public override IId Id
             get
             {
                 return assemblyPath == null
-                    ? new Key(assembly, ";assembly")
-                    : new Key(assembly, "#file:///", assemblyPath.Replace("\\", "/"), ";assembly");
+                    ? new Key(assembly, ";sourcefile")
+                    : new Key(assembly, "#file:///", assemblyPath.Replace("\\", "/"), ";sourcefile");
             }
         }
     }