Merge pull request #3317 from Semmle/revert-2814-cs/unqualify-trap-ids

hvitved · web-flow · commit 5a2dcc591cab · 2020-04-22T20:46:35.000+02:00
Revert "C#: Improve db consistency by removing assembly id"
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -77,7 +77,7 @@ public override void Populate(TextWriter trapFile)
         }
 
         public new static Accessor Create(Context cx, IMethodSymbol symbol) =>
-            AccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+            AccessorFactory.Instance.CreateEntity(cx, symbol);
 
         class AccessorFactory : ICachedEntityFactory<IMethodSymbol, Accessor>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -104,7 +104,7 @@ ConstructorDeclarationSyntax Syntax
             {
                 case MethodKind.StaticConstructor:
                 case MethodKind.Constructor:
-                    return ConstructorFactory.Instance.CreateEntityFromSymbol(cx, constructor);
+                    return ConstructorFactory.Instance.CreateEntity(cx, constructor);
                 default:
                     throw new InternalError(constructor, "Attempt to create a Constructor from a symbol that isn't a constructor");
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Conversion.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Conversion.cs
@@ -11,7 +11,7 @@ class Conversion : UserOperator
             : base(cx, init) { }
 
         public new static Conversion Create(Context cx, IMethodSymbol symbol) =>
-            ConversionFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+            ConversionFactory.Instance.CreateEntity(cx, symbol);
 
         public override Microsoft.CodeAnalysis.Location ReportingLocation
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
@@ -24,7 +24,7 @@ public override void Populate(TextWriter trapFile)
         }
 
         public new static Destructor Create(Context cx, IMethodSymbol symbol) =>
-            DestructorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+            DestructorFactory.Instance.CreateEntity(cx, symbol);
 
         class DestructorFactory : ICachedEntityFactory<IMethodSymbol, Destructor>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
@@ -60,7 +60,7 @@ public override void Populate(TextWriter trapFile)
                 TypeMention.Create(Context, syntaxType, this, type);
         }
 
-        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntity(cx, symbol);
 
         class EventFactory : ICachedEntityFactory<IEventSymbol, Event>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
@@ -53,7 +53,7 @@ public override void Populate(TextWriter trapFile)
         }
 
         public new static EventAccessor Create(Context cx, IMethodSymbol symbol) =>
-            EventAccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+            EventAccessorFactory.Instance.CreateEntity(cx, symbol);
 
         class EventAccessorFactory : ICachedEntityFactory<IMethodSymbol, EventAccessor>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -18,7 +18,7 @@ class Field : CachedSymbol<IFieldSymbol>, IExpressionParentEntity
             type = new Lazy<AnnotatedType>(() => Entities.Type.Create(cx, symbol.GetAnnotatedType()));
         }
 
-        public static Field Create(Context cx, IFieldSymbol field) => FieldFactory.Instance.CreateEntityFromSymbol(cx, field);
+        public static Field Create(Context cx, IFieldSymbol field) => FieldFactory.Instance.CreateEntity(cx, field);
 
         // Do not populate backing fields.
         // Populate Tuple fields.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
@@ -71,7 +71,7 @@ public override void Populate(TextWriter trapFile)
                 TypeMention.Create(Context, syntax.Type, this, type);
         }
 
-        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop);
+        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntity(cx, prop);
 
         public override void WriteId(TextWriter trapFile)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalFunction.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalFunction.cs
@@ -22,7 +22,7 @@ public override void WriteQuotedId(TextWriter trapFile)
             trapFile.Write('*');
         }
 
-        public static new LocalFunction Create(Context cx, IMethodSymbol field) => LocalFunctionFactory.Instance.CreateEntityFromSymbol(cx, field);
+        public static new LocalFunction Create(Context cx, IMethodSymbol field) => LocalFunctionFactory.Instance.CreateEntity(cx, field);
 
         class LocalFunctionFactory : ICachedEntityFactory<IMethodSymbol, LocalFunction>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs
@@ -43,7 +43,7 @@ symbol is ILocalSymbol l ?
 
         public static LocalVariable Create(Context cx, ISymbol local)
         {
-            return LocalVariableFactory.Instance.CreateEntityFromSymbol(cx, local);
+            return LocalVariableFactory.Instance.CreateEntity(cx, local);
         }
 
         void DefineConstantValue(TextWriter trapFile)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -129,7 +129,7 @@ protected static void BuildMethodId(Method m, TextWriter trapFile)
                     // Type arguments with different nullability can result in 
                     // a constructed method with different nullability of its parameters and return type,
                     // so we need to create a distinct database entity for it.
-                    trapFile.BuildList(",", m.symbol.GetAnnotatedTypeArguments(), (ta, tb0) => { AddSignatureTypeToId(m.Context, tb0, m.symbol, ta.Symbol, m.symbol); trapFile.Write((int)ta.Nullability); });
+                    trapFile.BuildList(",", m.symbol.GetAnnotatedTypeArguments(), (ta, tb0) => { AddSignatureTypeToId(m.Context, tb0, m.symbol, ta.Symbol); trapFile.Write((int)ta.Nullability); });
                     trapFile.Write('>');
                 }
             }
@@ -199,9 +199,12 @@ public override void WriteId(TextWriter trapFile)
         /// to make the reference to <code>#3</code> in the label definition <code>#4</code> for
         /// <code>T</code> valid.
         /// </summary>
-        protected static void AddSignatureTypeToId(Context cx, TextWriter trapFile, IMethodSymbol method, ITypeSymbol type, ISymbol symbolBeingDefined)
+        protected static void AddSignatureTypeToId(Context cx, TextWriter trapFile, IMethodSymbol method, ITypeSymbol type)
         {
-            type.BuildTypeId(cx, trapFile, false, symbolBeingDefined, (cx0, tb0, type0, g) => AddSignatureTypeToId(cx, tb0, method, type0, g));
+            if (type.ContainsTypeParameters(cx, method))
+                type.BuildTypeId(cx, trapFile, (cx0, tb0, type0) => AddSignatureTypeToId(cx, tb0, method, type0));
+            else
+                trapFile.WriteSubId(Type.Create(cx, type));
         }
 
         protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethodSymbol method)
@@ -212,13 +215,13 @@ protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethod
             if (method.MethodKind == MethodKind.ReducedExtension)
             {
                 trapFile.WriteSeparator(",", ref index);
-                AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType, method);
+                AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType);
             }
 
             foreach (var param in method.Parameters)
             {
                 trapFile.WriteSeparator(",", ref index);
-                AddSignatureTypeToId(cx, trapFile, method, param.Type, method);
+                AddSignatureTypeToId(cx, trapFile, method, param.Type);
                 switch (param.RefKind)
                 {
                     case RefKind.Out:
@@ -241,10 +244,9 @@ protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethod
 
         public static void AddExplicitInterfaceQualifierToId(Context cx, System.IO.TextWriter trapFile, IEnumerable<ISymbol> explicitInterfaceImplementations)
         {
-            foreach (var i in explicitInterfaceImplementations)
+            if (explicitInterfaceImplementations.Any())
             {
-                trapFile.Write(';');
-                i.ContainingType.BuildNestedTypeId(cx, trapFile, null);
+                trapFile.AppendList(",", explicitInterfaceImplementations.Select(impl => cx.CreateEntity(impl.ContainingType)));
             }
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -49,7 +49,7 @@ public override void Populate(TextWriter trapFile)
             ExtractCompilerGenerated(trapFile);
         }
 
-        public new static OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);
+        public new static OrdinaryMethod Create(Context cx, IMethodSymbol method) => OrdinaryMethodFactory.Instance.CreateEntity(cx, method);
 
         class OrdinaryMethodFactory : ICachedEntityFactory<IMethodSymbol, OrdinaryMethod>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -113,7 +113,7 @@ public static Property Create(Context cx, IPropertySymbol prop)
         {
             bool isIndexer = prop.IsIndexer || prop.Parameters.Any();
 
-            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop);
+            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntity(cx, prop);
         }
 
         public void VisitDeclaration(Context cx, PropertyDeclarationSyntax p)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/ArrayType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/ArrayType.cs
@@ -36,7 +36,7 @@ public override void WriteId(TextWriter trapFile)
             trapFile.Write(";type");
         }
 
-        public static ArrayType Create(Context cx, IArrayTypeSymbol symbol) => ArrayTypeFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static ArrayType Create(Context cx, IArrayTypeSymbol symbol) => ArrayTypeFactory.Instance.CreateEntity(cx, symbol);
 
         class ArrayTypeFactory : ICachedEntityFactory<IArrayTypeSymbol, ArrayType>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs
@@ -9,7 +9,7 @@ class DynamicType : Type<IDynamicTypeSymbol>
         DynamicType(Context cx, IDynamicTypeSymbol init)
             : base(cx, init) { }
 
-        public static DynamicType Create(Context cx, IDynamicTypeSymbol type) => DynamicTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
+        public static DynamicType Create(Context cx, IDynamicTypeSymbol type) => DynamicTypeFactory.Instance.CreateEntity(cx, type);
 
         public override Microsoft.CodeAnalysis.Location ReportingLocation => Context.Compilation.ObjectType.Locations.FirstOrDefault();
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -17,7 +17,7 @@ class NamedType : Type<INamedTypeSymbol>
             typeArgumentsLazy = new Lazy<Type[]>(() => symbol.TypeArguments.Select(t => Create(cx, t)).ToArray());
         }
 
-        public static NamedType Create(Context cx, INamedTypeSymbol type) => NamedTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
+        public static NamedType Create(Context cx, INamedTypeSymbol type) => NamedTypeFactory.Instance.CreateEntity(cx, type);
 
         public override bool NeedsPopulation => base.NeedsPopulation || symbol.TypeKind == TypeKind.Error;
 
@@ -111,7 +111,7 @@ public override IEnumerable<Extraction.Entities.Location> Locations
 
         public override void WriteId(TextWriter trapFile)
         {
-            symbol.BuildTypeId(Context, trapFile, true, symbol, (cx0, tb0, sub, _) => tb0.WriteSubId(Create(cx0, sub)));
+            symbol.BuildTypeId(Context, trapFile, (cx0, tb0, sub) => tb0.WriteSubId(Create(cx0, sub)));
             trapFile.Write(";type");
         }
 
@@ -177,7 +177,7 @@ class NamedTypeRefFactory : ICachedEntityFactory<INamedTypeSymbol, NamedTypeRef>
 
         public override void WriteId(TextWriter trapFile)
         {
-            referencedType.symbol.BuildNestedTypeId(Context, trapFile, referencedType.symbol);
+            trapFile.WriteSubId(referencedType);
             trapFile.Write(";typeRef");
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/PointerType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/PointerType.cs
@@ -29,7 +29,7 @@ public override void Populate(TextWriter trapFile)
 
         public Type PointedAtType { get; private set; }
 
-        public static PointerType Create(Context cx, IPointerTypeSymbol symbol) => PointerTypeFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static PointerType Create(Context cx, IPointerTypeSymbol symbol) => PointerTypeFactory.Instance.CreateEntity(cx, symbol);
 
         class PointerTypeFactory : ICachedEntityFactory<IPointerTypeSymbol, PointerType>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs
@@ -13,7 +13,7 @@ namespace Semmle.Extraction.CSharp.Entities
     /// </summary>
     class TupleType : Type<INamedTypeSymbol>
     {
-        public static TupleType Create(Context cx, INamedTypeSymbol type) => TupleTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
+        public static TupleType Create(Context cx, INamedTypeSymbol type) => TupleTypeFactory.Instance.CreateEntity(cx, type);
 
         class TupleTypeFactory : ICachedEntityFactory<INamedTypeSymbol, TupleType>
         {
@@ -32,7 +32,7 @@ class TupleTypeFactory : ICachedEntityFactory<INamedTypeSymbol, TupleType>
 
         public override void WriteId(TextWriter trapFile)
         {
-            symbol.BuildTypeId(Context, trapFile, false, symbol, (cx0, tb0, sub, _) => tb0.WriteSubId(Create(cx0, sub)));
+            symbol.BuildTypeId(Context, trapFile, (cx0, tb0, sub) => tb0.WriteSubId(Create(cx0, sub)));
             trapFile.Write(";tuple");
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -324,14 +324,6 @@ public virtual IEnumerable<Type> TypeMentions
         }
 
         public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.NoLabel;
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as Type;
-            return other?.GetType() == GetType() && SymbolEqualityComparer.IncludeNullability.Equals(other.symbol, symbol);
-        }
-
-        public override int GetHashCode() => SymbolEqualityComparer.IncludeNullability.GetHashCode(symbol);
     }
 
     abstract class Type<T> : Type where T : ITypeSymbol
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
@@ -88,7 +88,7 @@ public override void Populate(TextWriter trapFile)
         }
 
         static public TypeParameter Create(Context cx, ITypeParameterSymbol p) =>
-            TypeParameterFactory.Instance.CreateEntityFromSymbol(cx, p);
+            TypeParameterFactory.Instance.CreateEntity(cx, p);
 
         /// <summary>
         /// The variance of this type parameter.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
@@ -51,7 +51,7 @@ public override Type ContainingType
 
         public override void WriteId(TextWriter trapFile)
         {
-            AddSignatureTypeToId(Context, trapFile, symbol, symbol.ReturnType, symbol); // Needed for op_explicit(), which differs only by return type.
+            AddSignatureTypeToId(Context, trapFile, symbol, symbol.ReturnType); // Needed for op_explicit(), which differs only by return type.
             trapFile.Write(' ');
             BuildMethodId(this, trapFile);
         }
@@ -190,7 +190,7 @@ public static string OperatorSymbol(Context cx, string methodName)
             return result;
         }
 
-        public new static UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public new static UserOperator Create(Context cx, IMethodSymbol symbol) => UserOperatorFactory.Instance.CreateEntity(cx, symbol);
 
         class UserOperatorFactory : ICachedEntityFactory<IMethodSymbol, UserOperator>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs
diff --git a/csharp/extractor/Semmle.Extraction/Context.cs b/csharp/extractor/Semmle.Extraction/Context.cs
diff --git a/csharp/extractor/Semmle.Extraction/Entity.cs b/csharp/extractor/Semmle.Extraction/Entity.cs
diff --git a/csharp/ql/test/library-tests/aliases/aliases2.expected b/csharp/ql/test/library-tests/aliases/aliases2.expected
diff --git a/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected b/csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public override void Populate(TextWriter trapFile)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public new static Accessor Create(Context cx, IMethodSymbol symbol) =>`
`80`		`- AccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`80`	`+ AccessorFactory.Instance.CreateEntity(cx, symbol);`
`81`	`81`
`82`	`82`	`class AccessorFactory : ICachedEntityFactory<IMethodSymbol, Accessor>`
`83`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ ConstructorDeclarationSyntax Syntax`
`104`	`104`	`{`
`105`	`105`	`case MethodKind.StaticConstructor:`
`106`	`106`	`case MethodKind.Constructor:`
`107`		`- return ConstructorFactory.Instance.CreateEntityFromSymbol(cx, constructor);`
	`107`	`+ return ConstructorFactory.Instance.CreateEntity(cx, constructor);`
`108`	`108`	`default:`
`109`	`109`	`throw new InternalError(constructor, "Attempt to create a Constructor from a symbol that isn't a constructor");`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class Conversion : UserOperator`
`11`	`11`	`: base(cx, init) { }`
`12`	`12`
`13`	`13`	`public new static Conversion Create(Context cx, IMethodSymbol symbol) =>`
`14`		`- ConversionFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`14`	`+ ConversionFactory.Instance.CreateEntity(cx, symbol);`
`15`	`15`
`16`	`16`	`public override Microsoft.CodeAnalysis.Location ReportingLocation`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override void Populate(TextWriter trapFile)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public new static Destructor Create(Context cx, IMethodSymbol symbol) =>`
`27`		`- DestructorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`27`	`+ DestructorFactory.Instance.CreateEntity(cx, symbol);`
`28`	`28`
`29`	`29`	`class DestructorFactory : ICachedEntityFactory<IMethodSymbol, Destructor>`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public override void Populate(TextWriter trapFile)`
`60`	`60`	`TypeMention.Create(Context, syntaxType, this, type);`
`61`	`61`	`}`
`62`	`62`
`63`		`- public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`63`	`+ public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntity(cx, symbol);`
`64`	`64`
`65`	`65`	`class EventFactory : ICachedEntityFactory<IEventSymbol, Event>`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public override void Populate(TextWriter trapFile)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public new static EventAccessor Create(Context cx, IMethodSymbol symbol) =>`
`56`		`- EventAccessorFactory.Instance.CreateEntityFromSymbol(cx, symbol);`
	`56`	`+ EventAccessorFactory.Instance.CreateEntity(cx, symbol);`
`57`	`57`
`58`	`58`	`class EventAccessorFactory : ICachedEntityFactory<IMethodSymbol, EventAccessor>`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Field : CachedSymbol<IFieldSymbol>, IExpressionParentEntity`
`18`	`18`	`type = new Lazy<AnnotatedType>(() => Entities.Type.Create(cx, symbol.GetAnnotatedType()));`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static Field Create(Context cx, IFieldSymbol field) => FieldFactory.Instance.CreateEntityFromSymbol(cx, field);`
	`21`	`+ public static Field Create(Context cx, IFieldSymbol field) => FieldFactory.Instance.CreateEntity(cx, field);`
`22`	`22`
`23`	`23`	`// Do not populate backing fields.`
`24`	`24`	`// Populate Tuple fields.`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override void Populate(TextWriter trapFile)`
`71`	`71`	`TypeMention.Create(Context, syntax.Type, this, type);`
`72`	`72`	`}`
`73`	`73`
`74`		`- public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop);`
	`74`	`+ public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntity(cx, prop);`
`75`	`75`
`76`	`76`	`public override void WriteId(TextWriter trapFile)`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public override void WriteQuotedId(TextWriter trapFile)`
`22`	`22`	`trapFile.Write('*');`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static new LocalFunction Create(Context cx, IMethodSymbol field) => LocalFunctionFactory.Instance.CreateEntityFromSymbol(cx, field);`
	`25`	`+ public static new LocalFunction Create(Context cx, IMethodSymbol field) => LocalFunctionFactory.Instance.CreateEntity(cx, field);`
`26`	`26`
`27`	`27`	`class LocalFunctionFactory : ICachedEntityFactory<IMethodSymbol, LocalFunction>`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ symbol is ILocalSymbol l ?`
`43`	`43`
`44`	`44`	`public static LocalVariable Create(Context cx, ISymbol local)`
`45`	`45`	`{`
`46`		`- return LocalVariableFactory.Instance.CreateEntityFromSymbol(cx, local);`
	`46`	`+ return LocalVariableFactory.Instance.CreateEntity(cx, local);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void DefineConstantValue(TextWriter trapFile)`