Merge pull request #590 from calumgrant/cs/metadata-handles2

hvitved · web-flow · commit 54520003f827 · 2019-01-03T18:49:24.000+01:00
C#: Extract the metadata handle
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs
@@ -4,6 +4,7 @@
 using Microsoft.CodeAnalysis;
 using System.Reflection.Metadata;
 using System.Reflection;
+using System.Reflection.Metadata.Ecma335;
 
 namespace Semmle.Extraction.CIL.Entities
 {
@@ -72,11 +73,13 @@ public void Extract(Context cx2)
 
     sealed class DefinitionField : Field
     {
+        readonly Handle handle;
         readonly FieldDefinition fd;
         readonly GenericContext gc;
 
         public DefinitionField(GenericContext gc, FieldDefinitionHandle handle) : base(gc.cx)
         {
+            this.handle = handle;
             this.gc = gc;
             fd = cx.mdReader.GetFieldDefinition(handle);
             ShortId = DeclaringType.ShortId + cx.Dot + Name;
@@ -86,6 +89,8 @@ public override IEnumerable<IExtractionProduct> Contents
         {
             get
             {
+                yield return Tuples.metadata_handle(this, cx.assembly, MetadataTokens.GetToken(handle));
+
                 foreach (var c in base.Contents)
                     yield return c;
 
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs
@@ -16,8 +16,8 @@ public class File : LabelledEntity, IFile
 
         public File(Context cx, string path) : base(cx)
         {
-            this.path = path.Replace("\\", "/");
-            ShortId = new StringId(path.Replace(":", "_"));
+            this.path = Semmle.Extraction.Entities.File.PathAsDatabaseString(path);
+            ShortId = new StringId(Semmle.Extraction.Entities.File.PathAsDatabaseId(path));
         }
 
         public override IEnumerable<IExtractionProduct> Contents
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Folder.cs
@@ -14,7 +14,7 @@ public class Folder : LabelledEntity, IFolder
         public Folder(Context cx, string path) : base(cx)
         {
             this.path = path;
-            ShortId = new StringId(path.Replace("\\", "/").Replace(":", "_"));
+            ShortId = new StringId(Semmle.Extraction.Entities.File.PathAsDatabaseId(path));
         }
 
         static readonly Id suffix = new StringId(";folder");
@@ -33,7 +33,7 @@ public override IEnumerable<IExtractionProduct> Contents
                     yield return parentFolder;
                     yield return Tuples.containerparent(parentFolder, this);
                 }
-                yield return Tuples.folders(this, path, Path.GetFileName(path));
+                yield return Tuples.folders(this, Semmle.Extraction.Entities.File.PathAsDatabaseString(path), Path.GetFileName(path));
             }
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 
 namespace Semmle.Extraction.CIL.Entities
 {
@@ -134,6 +135,7 @@ public override IEnumerable<IExtractionProduct> Contents
     /// </summary>
     class DefinitionMethod : Method, IMember
     {
+        readonly Handle handle;
         readonly MethodDefinition md;
         readonly PDB.IMethod methodDebugInformation;
 
@@ -147,6 +149,7 @@ public DefinitionMethod(GenericContext gc, MethodDefinitionHandle handle) : base
         {
             md = cx.mdReader.GetMethodDefinition(handle);
             this.gc = gc;
+            this.handle = handle;
             name = cx.GetId(md.Name);
 
             declaringType = (Type)cx.CreateGeneric(this, md.GetDeclaringType());
@@ -205,6 +208,7 @@ public override IEnumerable<IExtractionProduct> Contents
                     Attribute.Populate(cx, pe, p.GetCustomAttributes());
                 }
 
+                yield return Tuples.metadata_handle(this, cx.assembly, MetadataTokens.GetToken(handle));
                 yield return Tuples.cil_method(this, Name, declaringType, typeSignature.ReturnType);
                 yield return Tuples.cil_method_source_declaration(this, this);
                 yield return Tuples.cil_method_location(this, cx.assembly);
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Property.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Reflection.Metadata;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 
 namespace Semmle.Extraction.CIL.Entities
 {
@@ -16,12 +17,14 @@ interface IProperty : ILabelledEntity
     /// </summary>
     class Property : LabelledEntity, IProperty
     {
+        readonly Handle handle;
         readonly Type type;
         readonly PropertyDefinition pd;
         static readonly Id suffix = CIL.Id.Create(";cil-property");
 
         public Property(GenericContext gc, Type type, PropertyDefinitionHandle handle) : base(gc.cx)
         {
+            this.handle = handle;
             pd = cx.mdReader.GetPropertyDefinition(handle);
             this.type = type;
 
@@ -35,6 +38,7 @@ public override IEnumerable<IExtractionProduct> Contents
         {
             get
             {
+                yield return Tuples.metadata_handle(this, cx.assembly, MetadataTokens.GetToken(handle));
                 var sig = pd.DecodeSignature(cx.TypeSignatureDecoder, type);
 
                 yield return Tuples.cil_property(this, type, cx.ShortName(pd.Name), sig.ReturnType);
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs
@@ -248,11 +248,13 @@ public bool IsPrimitiveType
     /// </summary>
     public sealed class TypeDefinitionType : Type
     {
+        readonly Handle handle;
         readonly TypeDefinition td;
 
         public TypeDefinitionType(Context cx, TypeDefinitionHandle handle) : base(cx)
         {
             td = cx.mdReader.GetTypeDefinition(handle);
+            this.handle = handle;
 
             declType =
                 td.GetDeclaringType().IsNil ? null :
@@ -373,6 +375,8 @@ public override IEnumerable<IExtractionProduct> Contents
         {
             get
             {
+                yield return Tuples.metadata_handle(this, cx.assembly, handle.GetHashCode());
+
                 foreach (var c in base.Contents) yield return c;
 
                 MakeTypeParameters();
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Tuples.cs b/csharp/extractor/Semmle.Extraction.CIL/Tuples.cs
@@ -200,6 +200,9 @@ internal static Tuple folders(IFolder folder, string path, string name) =>
         internal static Tuple locations_default(ISourceLocation label, IFile file, int startLine, int startCol, int endLine, int endCol) =>
             new Tuple("locations_default", label, file, startLine, startCol, endLine, endCol);
 
+        internal static Tuple metadata_handle(IEntity entity, Assembly assembly, int handleValue) =>
+            new Tuple("metadata_handle", entity, assembly, handleValue);
+
         internal static Tuple namespaces(INamespace ns, string name) =>
             new Tuple("namespaces", ns, name);
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -24,6 +24,7 @@ class Field : CachedSymbol<IFieldSymbol>, IExpressionParentEntity
 
         public override void Populate()
         {
+            ExtractMetadataHandle();
             ExtractAttributes();
             ContainingType.ExtractGenerics();
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -361,6 +361,7 @@ protected void PopulateMethod()
             ExtractParameters();
             ExtractMethodBody();
             ExtractGenerics();
+            ExtractMetadataHandle();
         }
 
         public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.PushesLabel;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -29,6 +29,7 @@ public override IId Id
 
         public override void Populate()
         {
+            ExtractMetadataHandle();
             ExtractAttributes();
             ExtractModifiers();
             BindComments();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Symbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Symbol.cs
@@ -3,6 +3,8 @@
 using Semmle.Extraction.Entities;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection.Metadata;
+using System.Reflection.Metadata.Ecma335;
 
 namespace Semmle.Extraction.CSharp.Entities
 {
@@ -98,5 +100,35 @@ public ExpressionSyntax ExpressionBody
         public override bool NeedsPopulation => Context.Defines(symbol);
 
         public Extraction.Entities.Location Location => Context.Create(ReportingLocation);
+
+        protected void ExtractMetadataHandle()
+        {
+            var handle = MetadataHandle;
+
+            if (handle.HasValue)
+                Context.Emit(Tuples.metadata_handle(this, Location, MetadataTokens.GetToken(handle.Value)));
+        }
+
+        public Handle? MetadataHandle
+        {
+            get
+            {
+                var propertyInfo = symbol.GetType().GetProperty("Handle",
+                    System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.GetProperty);
+
+                if (propertyInfo != null)
+                {
+                    switch (propertyInfo.GetValue(symbol))
+                    {
+                        case MethodDefinitionHandle md: return md;
+                        case TypeDefinitionHandle td: return td;
+                        case PropertyDefinitionHandle pd: return pd;
+                        case FieldDefinitionHandle fd: return fd;
+                    }
+                }
+
+                return null;
+            }
+        }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -86,6 +86,7 @@ public ITrapBuilder AppendLine()
 
         protected void ExtractType()
         {
+            ExtractMetadataHandle();
             ExtractAttributes();
 
             var tb = new DisplayNameTrapBuilder();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs b/csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs
@@ -130,6 +130,9 @@ internal static class Tuples
 
         internal static Tuple localvars(LocalVariable key, int @const, string name, int @var, Type type, Expression expr) => new Tuple("localvars", key, @const, name, @var, type, expr);
 
+        public static Tuple metadata_handle(IEntity entity, Location assembly, int handleValue) =>
+            new Tuple("metadata_handle", entity, assembly, handleValue);
+
         internal static Tuple method_location(Method method, Location location) => new Tuple("method_location", method, location);
 
         internal static Tuple methods(Method method, string name, Type declType, Type retType, Method originalDefinition) => new Tuple("methods", method, name, declType, retType, originalDefinition);
diff --git a/csharp/extractor/Semmle.Extraction/Entities/File.cs b/csharp/extractor/Semmle.Extraction/Entities/File.cs
@@ -19,7 +19,7 @@ public string Path
             private set;
         }
 
-        public string DatabasePath => FileAsDatabaseString(Path);
+        public string DatabasePath => PathAsDatabaseId(Path);
 
         public override bool NeedsPopulation => Context.DefinesFile(Path) || Path == Context.Extractor.OutputPath;
 
@@ -41,7 +41,7 @@ public override void Populate()
                 // remove the dot from the extension
                 if (extension.Length > 0)
                     extension = extension.Substring(1);
-                Context.Emit(Tuples.files(this, DatabasePath, name, extension));
+                Context.Emit(Tuples.files(this, PathAsDatabaseString(Path), name, extension));
 
                 Context.Emit(Tuples.containerparent(Entities.Folder.Create(Context, fi.Directory), this));
                 if (fromSource == 1)
@@ -73,14 +73,21 @@ public override IId Id
             }
         }
 
-        internal static string FileAsDatabaseString(string fileName)
+        /// <summary>
+        /// Converts a path string into a string to use as an ID
+        /// in the QL database.
+        /// </summary>
+        /// <param name="path">An absolute path.</param>
+        /// <returns>The database ID.</returns>
+        public static string PathAsDatabaseId(string path)
         {
-            fileName = fileName.Replace('\\', '/');
-            if (fileName.Length > 1 && fileName[1] == ':')
-                fileName = Char.ToUpper(fileName[0]) + fileName.Substring(1);
-            return fileName;
+            if (path.Length >= 2 && path[1] == ':' && Char.IsLower(path[0]))
+                path = Char.ToUpper(path[0]) + "_" + path.Substring(2);
+            return path.Replace('\\', '/').Replace(":", "_");
         }
 
+        public static string PathAsDatabaseString(string path) => path.Replace('\\', '/');
+
         public static File Create(Context cx, string path) => FileFactory.Instance.CreateEntity(cx, path);
 
         public static File CreateGenerated(Context cx) => GeneratedFile.Create(cx);
diff --git a/csharp/extractor/Semmle.Extraction/Entities/Folder.cs b/csharp/extractor/Semmle.Extraction/Entities/Folder.cs
@@ -16,7 +16,7 @@ public string Path
             private set;
         }
 
-        public string DatabasePath => File.FileAsDatabaseString(Path);
+        public string DatabasePath => File.PathAsDatabaseId(Path);
 
         public override void Populate()
         {
@@ -27,7 +27,7 @@ public override void Populate()
             // On Windows: System.IO.DirectoryInfo.Name returns "L:\"
             string shortName = symbol.Parent == null ? "" : symbol.Name;
 
-            Context.Emit(Tuples.folders(this, DatabasePath, shortName));
+            Context.Emit(Tuples.folders(this, Semmle.Extraction.Entities.File.PathAsDatabaseString(Path), shortName));
             if (symbol.Parent != null)
             {
                 Context.Emit(Tuples.containerparent(Create(Context, symbol.Parent), this));
diff --git a/csharp/ql/src/semmle/code/csharp/commons/Disposal.qll b/csharp/ql/src/semmle/code/csharp/commons/Disposal.qll
@@ -38,7 +38,7 @@ private predicate disposedCSharpVariable(Variable variable) {
   // A C# parameter is disposed if its corresponding CIL parameter is disposed
   exists(CIL::Method m, CIL::Parameter p, int i |
     disposedCilVariable(p) and p = m.getRawParameter(i) |
-    variable = any(Callable c2 | c2.getLabel() = m.getLabel()).getRawParameter(i)
+    variable = any(Callable c2 | c2.matchesHandle(m)).getRawParameter(i)
   )
   or
   // Call to a method that disposes it
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/DataFlow.qll b/csharp/ql/src/semmle/code/csharp/dataflow/DataFlow.qll
@@ -627,14 +627,14 @@ module DataFlow {
           result = sourceDecl
         else if sourceDecl instanceof CIL::Callable then
           // CIL callable with C# implementation in the database
-          sourceDecl.getLabel() = result.(Callable).getLabel()
+          sourceDecl.matchesHandle(result.(Callable))
           or
           // CIL callable without C# implementation in the database
-          not sourceDecl.getLabel() = any(Callable k).getLabel() and
+          not sourceDecl.matchesHandle(any(Callable k)) and
           result = sourceDecl
         else
           // C# callable without C# implementation in the database
-          sourceDecl.getLabel() = result.(CIL::Callable).getLabel()
+          sourceDecl.matchesHandle(result.(CIL::Callable))
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/dotnet/Element.qll b/csharp/ql/src/semmle/code/dotnet/Element.qll
@@ -82,6 +82,14 @@ class NamedElement extends Element, @dotnet_named_element {
   /** Gets a unique string label for this element. */
   string getLabel() { none() }
 
+  /** Holds if `other` has the same metadata handle in the same assembly. */
+  predicate matchesHandle(NamedElement other) {
+    exists(Assembly asm, int handle |
+      metadata_handle(this, asm, handle) and
+      metadata_handle(other, asm, handle)
+    )
+  }
+
   /**
    * Holds if this element was compiled from source code that is also present in the
    * database. That is, this element corresponds to another element from source.
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme b/csharp/ql/src/semmlecode.csharp.dbscheme
@@ -1699,3 +1699,9 @@ cil_attribute_positional_argument(
 @dotnet_int_literal = @integer_literal_expr | @cil_ldc_i;
 @dotnet_float_literal = @float_literal_expr | @cil_ldc_r;
 @dotnet_null_literal = @null_literal_expr | @cil_ldnull;
+
+@metadata_entity = @cil_method | @cil_type | @cil_field | @cil_property | @field | @property |
+    @callable | @value_or_ref_type | @void_type;
+
+#keyset[entity, location]
+metadata_handle(int entity : @metadata_entity ref, int location: @assembly ref, int handle: int ref)
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme.stats b/csharp/ql/src/semmlecode.csharp.dbscheme.stats
diff --git a/csharp/ql/test/library-tests/cil/consistency/Handles.expected b/csharp/ql/test/library-tests/cil/consistency/Handles.expected
diff --git a/csharp/ql/test/library-tests/cil/consistency/Handles.ql b/csharp/ql/test/library-tests/cil/consistency/Handles.ql

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Microsoft.CodeAnalysis;`
`5`	`5`	`using System.Reflection.Metadata;`
`6`	`6`	`using System.Reflection;`
	`7`	`+using System.Reflection.Metadata.Ecma335;`
`7`	`8`
`8`	`9`	`namespace Semmle.Extraction.CIL.Entities`
`9`	`10`	`{`
`@@ -72,11 +73,13 @@ public void Extract(Context cx2)`
`72`	`73`
`73`	`74`	`sealed class DefinitionField : Field`
`74`	`75`	`{`
	`76`	`+ readonly Handle handle;`
`75`	`77`	`readonly FieldDefinition fd;`
`76`	`78`	`readonly GenericContext gc;`
`77`	`79`
`78`	`80`	`public DefinitionField(GenericContext gc, FieldDefinitionHandle handle) : base(gc.cx)`
`79`	`81`	`{`
	`82`	`+ this.handle = handle;`
`80`	`83`	`this.gc = gc;`
`81`	`84`	`fd = cx.mdReader.GetFieldDefinition(handle);`
`82`	`85`	`ShortId = DeclaringType.ShortId + cx.Dot + Name;`
`@@ -86,6 +89,8 @@ public override IEnumerable<IExtractionProduct> Contents`
`86`	`89`	`{`
`87`	`90`	`get`
`88`	`91`	`{`
	`92`	`+ yield return Tuples.metadata_handle(this, cx.assembly, MetadataTokens.GetToken(handle));`
	`93`	`+`
`89`	`94`	`foreach (var c in base.Contents)`
`90`	`95`	`yield return c;`
`91`	`96`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public class File : LabelledEntity, IFile`
`16`	`16`
`17`	`17`	`public File(Context cx, string path) : base(cx)`
`18`	`18`	`{`
`19`		`- this.path = path.Replace("\\", "/");`
`20`		`- ShortId = new StringId(path.Replace(":", "_"));`
	`19`	`+ this.path = Semmle.Extraction.Entities.File.PathAsDatabaseString(path);`
	`20`	`+ ShortId = new StringId(Semmle.Extraction.Entities.File.PathAsDatabaseId(path));`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public override IEnumerable<IExtractionProduct> Contents`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class Folder : LabelledEntity, IFolder`
`14`	`14`	`public Folder(Context cx, string path) : base(cx)`
`15`	`15`	`{`
`16`	`16`	`this.path = path;`
`17`		`- ShortId = new StringId(path.Replace("\\", "/").Replace(":", "_"));`
	`17`	`+ ShortId = new StringId(Semmle.Extraction.Entities.File.PathAsDatabaseId(path));`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`static readonly Id suffix = new StringId(";folder");`
`@@ -33,7 +33,7 @@ public override IEnumerable<IExtractionProduct> Contents`
`33`	`33`	`yield return parentFolder;`
`34`	`34`	`yield return Tuples.containerparent(parentFolder, this);`
`35`	`35`	`}`
`36`		`- yield return Tuples.folders(this, path, Path.GetFileName(path));`
	`36`	`+ yield return Tuples.folders(this, Semmle.Extraction.Entities.File.PathAsDatabaseString(path), Path.GetFileName(path));`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Reflection.Metadata;`
`3`	`3`	`using System.Linq;`
	`4`	`+using System.Reflection.Metadata.Ecma335;`
`4`	`5`
`5`	`6`	`namespace Semmle.Extraction.CIL.Entities`
`6`	`7`	`{`
`@@ -16,12 +17,14 @@ interface IProperty : ILabelledEntity`
`16`	`17`	`/// </summary>`
`17`	`18`	`class Property : LabelledEntity, IProperty`
`18`	`19`	`{`
	`20`	`+ readonly Handle handle;`
`19`	`21`	`readonly Type type;`
`20`	`22`	`readonly PropertyDefinition pd;`
`21`	`23`	`static readonly Id suffix = CIL.Id.Create(";cil-property");`
`22`	`24`
`23`	`25`	`public Property(GenericContext gc, Type type, PropertyDefinitionHandle handle) : base(gc.cx)`
`24`	`26`	`{`
	`27`	`+ this.handle = handle;`
`25`	`28`	`pd = cx.mdReader.GetPropertyDefinition(handle);`
`26`	`29`	`this.type = type;`
`27`	`30`
`@@ -35,6 +38,7 @@ public override IEnumerable<IExtractionProduct> Contents`
`35`	`38`	`{`
`36`	`39`	`get`
`37`	`40`	`{`
	`41`	`+ yield return Tuples.metadata_handle(this, cx.assembly, MetadataTokens.GetToken(handle));`
`38`	`42`	`var sig = pd.DecodeSignature(cx.TypeSignatureDecoder, type);`
`39`	`43`
`40`	`44`	`yield return Tuples.cil_property(this, type, cx.ShortName(pd.Name), sig.ReturnType);`
Original file line number	Diff line number	Diff line change
`@@ -248,11 +248,13 @@ public bool IsPrimitiveType`
`248`	`248`	`/// </summary>`
`249`	`249`	`public sealed class TypeDefinitionType : Type`
`250`	`250`	`{`
	`251`	`+ readonly Handle handle;`
`251`	`252`	`readonly TypeDefinition td;`
`252`	`253`
`253`	`254`	`public TypeDefinitionType(Context cx, TypeDefinitionHandle handle) : base(cx)`
`254`	`255`	`{`
`255`	`256`	`td = cx.mdReader.GetTypeDefinition(handle);`
	`257`	`+ this.handle = handle;`
`256`	`258`
`257`	`259`	`declType =`
`258`	`260`	`td.GetDeclaringType().IsNil ? null :`
`@@ -373,6 +375,8 @@ public override IEnumerable<IExtractionProduct> Contents`
`373`	`375`	`{`
`374`	`376`	`get`
`375`	`377`	`{`
	`378`	`+ yield return Tuples.metadata_handle(this, cx.assembly, handle.GetHashCode());`
	`379`	`+`
`376`	`380`	`foreach (var c in base.Contents) yield return c;`
`377`	`381`
`378`	`382`	`MakeTypeParameters();`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class Field : CachedSymbol<IFieldSymbol>, IExpressionParentEntity`
`24`	`24`
`25`	`25`	`public override void Populate()`
`26`	`26`	`{`
	`27`	`+ ExtractMetadataHandle();`
`27`	`28`	`ExtractAttributes();`
`28`	`29`	`ContainingType.ExtractGenerics();`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,7 @@ protected void PopulateMethod()`
`361`	`361`	`ExtractParameters();`
`362`	`362`	`ExtractMethodBody();`
`363`	`363`	`ExtractGenerics();`
	`364`	`+ ExtractMetadataHandle();`
`364`	`365`	`}`
`365`	`366`
`366`	`367`	`public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.PushesLabel;`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public override IId Id`
`29`	`29`
`30`	`30`	`public override void Populate()`
`31`	`31`	`{`
	`32`	`+ ExtractMetadataHandle();`
`32`	`33`	`ExtractAttributes();`
`33`	`34`	`ExtractModifiers();`
`34`	`35`	`BindComments();`