More progress

Author: Windows10CE

src/AsmResolver.DotNet/DefaultPdbMetadataResolver.cs

@@ -2,6 +2,7 @@
 using System.IO.Compression;
 using System.Linq;
 using AsmResolver.DotNet.PortablePdbs;
+using AsmResolver.DotNet.PortablePdbs.Serialized;
 using AsmResolver.PE.Debug;
 
 namespace AsmResolver.DotNet;
@@ -10,17 +11,17 @@ public class DefaultPdbMetadataResolver : IPdbMetadataResolver
 {
     public static DefaultPdbMetadataResolver Instance { get; } = new();
 
-    public PortablePdb? ResolvePortablePdb(ModuleDefinition module)
+    public PdbReaderContext? ResolvePortablePdb(ModuleDefinition module)
     {
         if (module.DotNetDirectory?.Metadata is { } metadata && PortablePdb.TryFromMetadata(metadata, module, out var pdb))
         {
-            return pdb;
+            return pdb.PdbReaderContext;
         }
 
         // System.Reflection.Metadata tries reading from a file first, so we will as well
         if (module.FilePath is { } path && PortablePdb.TryFromFile(Path.ChangeExtension(path, ".pdb"), module, out pdb))
         {
-            return pdb;
+            return pdb.PdbReaderContext;
         }
 
         var pdbSection = module.DebugData.Select(dd => dd.Contents).OfType<PortablePdbDataSegment>().FirstOrDefault();
@@ -33,7 +34,7 @@ public class DefaultPdbMetadataResolver : IPdbMetadataResolver
             decompressStream.CopyTo(resultStream);
             if (PortablePdb.TryFromBytes(pdbData, module, out pdb))
             {
-                return pdb;
+                return pdb.PdbReaderContext;
             }
         }
 

src/AsmResolver.DotNet/IPdbMetadataResolver.cs

@@ -1,9 +1,10 @@
 using AsmResolver.DotNet.PortablePdbs;
+using AsmResolver.DotNet.PortablePdbs.Serialized;
 
 namespace AsmResolver.DotNet
 {
     public interface IPdbMetadataResolver
     {
-        PortablePdb? ResolvePortablePdb(ModuleDefinition module);
+        PdbReaderContext? ResolvePortablePdb(ModuleDefinition module);
     }
 }

src/AsmResolver.DotNet/MethodDefinition.cs

@@ -806,6 +806,16 @@ public MethodDebugInformation MethodDebugInformation
             set => _methodDebugInformation.SetValue(value);
         }
 
+        [LazyProperty]
+        public partial MethodDebugInformation? MethodDebugInformation
+        {
+            get;
+            set;
+        }
+
+        [LazyProperty]
+        public partial IList<LocalScope> LocalScopes { get; }
+
         /// <summary>
         /// Creates a new private static constructor for a type that is executed when its declaring type is loaded by the CLR.
         /// </summary>
@@ -1036,6 +1046,10 @@ protected virtual IList<GenericParameter> GetGenericParameters() =>
         /// </remarks>
         protected virtual UnmanagedExportInfo? GetExportInfo() => null;
 
+        protected virtual MethodDebugInformation? GetMethodDebugInformation() => null;
+
+        protected virtual IList<LocalScope> GetLocalScopes() => new OwnedCollection<MethodDefinition, LocalScope>(this);
+
         /// <summary>
         /// Asserts whether the method's metadata is consistent with its signature.
         /// </summary>

src/AsmResolver.DotNet/ModuleDefinition.cs

@@ -809,6 +809,9 @@ public IManagedEntryPoint? ManagedEntryPoint
             set => _managedEntryPoint.SetValue(value);
         }
 
+        [LazyProperty]
+        public partial PortablePdb? PortablePdb { get; set; }
+
         /// <summary>
         /// Gets the default importer instance for this module.
         /// </summary>
@@ -1248,6 +1251,8 @@ protected virtual IList<CustomAttribute> GetCustomAttributes() =>
         /// </remarks>
         protected virtual ReferenceImporter GetDefaultImporter() => new(this);
 
+        protected virtual PortablePdb? GetPortablePdb() => null;
+
         /// <summary>
         /// Detects the runtime that this module targets.
         /// </summary>

src/AsmResolver.DotNet/PortablePdbs/CustomDebugInformation.cs

@@ -0,0 +1,23 @@
+using System;
+using AsmResolver.Collections;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+
+namespace AsmResolver.DotNet.PortablePdbs.CustomRecords
+{
+    public partial class CustomDebugInformation : IMetadataMember, IOwnedCollectionElement<IHasCustomDebugInformation>
+    {
+        public MetadataToken MetadataToken
+        {
+            get;
+        }
+
+        [LazyProperty]
+        public partial IHasCustomDebugInformation? Owner
+        {
+            get;
+            set;
+        }
+
+
+    }
+}

src/AsmResolver.DotNet/PortablePdbs/CustomRecords/CustomDebugRecord.cs

@@ -0,0 +1,13 @@
+using System;
+using AsmResolver.DotNet.Signatures;
+
+namespace AsmResolver.DotNet.PortablePdbs.CustomRecords
+{
+    public abstract class CustomDebugRecord : ExtendableBlobSignature
+    {
+        public abstract Guid Kind
+        {
+            get;
+        }
+    }
+}

src/AsmResolver.DotNet/PortablePdbs/Document.cs

@@ -6,23 +6,13 @@
 namespace AsmResolver.DotNet.PortablePdbs
 {
     [DebuggerDisplay("{Name}")]
-    public class Document : IMetadataMember, IOwnedCollectionElement<PortablePdb>
+    public partial class Document : IMetadataMember, IOwnedCollectionElement<PortablePdb>
     {
-        private readonly LazyVariable<Document, Utf8String?> _name;
-        private readonly LazyVariable<Document, Guid> _hashAlgorithm;
-        private readonly LazyVariable<Document, byte[]?> _hash;
-        private readonly LazyVariable<Document, Guid> _language;
-
         public Document() : this(new MetadataToken(TableIndex.Document, 0)) { }
 
         public Document(MetadataToken token)
         {
             MetadataToken = token;
-
-            _name = new LazyVariable<Document, Utf8String?>(doc => doc.GetName());
-            _hashAlgorithm = new LazyVariable<Document, Guid>(doc => doc.GetHashAlgorithm());
-            _hash = new LazyVariable<Document, byte[]?>(doc => doc.GetHash());
-            _language = new LazyVariable<Document, Guid>(doc => doc.GetLanguage());
         }
 
         public MetadataToken MetadataToken { get; }
@@ -33,28 +23,32 @@ public PortablePdb? Owner
             set;
         }
 
-        public Utf8String? Name
+        [LazyProperty]
+        public partial Utf8String? Name
         {
-            get => _name.GetValue(this);
-            set => _name.SetValue(value);
+            get;
+            set;
         }
 
-        public Guid HashAlgorithm
+        [LazyProperty]
+        public partial Guid HashAlgorithm
         {
-            get => _hashAlgorithm.GetValue(this);
-            set => _hashAlgorithm.SetValue(value);
+            get;
+            set;
         }
 
-        public byte[]? Hash
+        [LazyProperty]
+        public partial byte[]? Hash
         {
-            get => _hash.GetValue(this);
-            set => _hash.SetValue(value);
+            get;
+            set;
         }
 
-        public Guid Language
+        [LazyProperty]
+        public partial Guid Language
         {
-            get => _language.GetValue(this);
-            set => _language.SetValue(value);
+            get;
+            set;
         }
 
         protected virtual Utf8String? GetName() => null;

src/AsmResolver.DotNet/PortablePdbs/IHasCustomDebugInformation.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using AsmResolver.DotNet.PortablePdbs.CustomRecords;
+
+namespace AsmResolver.DotNet.PortablePdbs
+{
+    public interface IHasCustomDebugInformation : IMetadataMember
+    {
+        IList<CustomDebugInformation> CustomDebugInformations
+        {
+            get;
+        }
+    }
+}

src/AsmResolver.DotNet/PortablePdbs/ImportScope.cs

@@ -0,0 +1,19 @@
+using AsmResolver.Collections;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+
+namespace AsmResolver.DotNet.PortablePdbs;
+
+public partial class ImportScope : IMetadataMember, IOwnedCollectionElement<ImportScope>
+{
+    public MetadataToken MetadataToken
+    {
+        get;
+    }
+
+    [LazyProperty]
+    public partial ImportScope? Owner
+    {
+        get;
+        set;
+    }
+}

src/AsmResolver.DotNet/PortablePdbs/KnownDocumentLanguage.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace AsmResolver.DotNet.PortablePdbs
+{
+    public static class KnownDocumentLanguage
+    {
+        public static Guid CSharp { get; } = new("3f5162f8-07c6-11d3-9053-00c04fa302a1");
+        public static Guid VisualBasic { get; } = new("3a12d0b8-c26c-11d0-b442-00a0244a1dd2");
+        public static Guid FSharp { get; } = new("ab4f38c9-b6e6-43ba-be3b-58080b2ccce3");
+    }
+}