From a0f61f99afb4c201c96e87a12604c560f98f6c32 Mon Sep 17 00:00:00 2001
From: Sven Boemer <sbomer@gmail.com>
Date: Wed, 25 Sep 2024 08:20:52 -0700
Subject: [PATCH] Preserve custom debug information on types (#948)

* Preserve custom debug info on types

* Use ICustomDebugInformationProvider in ISymbolReader/ISymbolWriter

* Move get logic to Mixin helpers

* Add test dll/pdb

* PR feedback

- Use static lambdas
- Check HasCustomDebugInformation
- Test writing modified CustomDebugInformation
- Formatting fixes

* Update Test/Mono.Cecil.Tests/PortablePdbTests.cs

Co-authored-by: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>

* Build for netstandard2.0

---------

Co-authored-by: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
---
 Directory.Build.props                         |   1 +
 Mono.Cecil.Cil/PortablePdb.cs                 |  21 ++++++++
 Mono.Cecil.Cil/Symbols.cs                     |  37 +++++++++++++
 Mono.Cecil/AssemblyReader.cs                  |  12 +++++
 Mono.Cecil/AssemblyWriter.cs                  |   3 ++
 Mono.Cecil/TypeDefinition.cs                  |  18 ++++++-
 Test/Mono.Cecil.Tests/BaseTestFixture.cs      |  49 +++++++++++++++++
 Test/Mono.Cecil.Tests/ILProcessorTests.cs     |  50 ------------------
 Test/Mono.Cecil.Tests/PortablePdbTests.cs     |  42 +++++++++++++++
 .../TypeDefinitionDebugInformation.dll        | Bin 0 -> 4608 bytes
 .../TypeDefinitionDebugInformation.pdb        | Bin 0 -> 7604 bytes
 symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs       |   5 ++
 symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs       |   4 ++
 symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs |   5 ++
 symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs |   4 ++
 15 files changed, 200 insertions(+), 51 deletions(-)
 create mode 100644 Test/Resources/assemblies/TypeDefinitionDebugInformation.dll
 create mode 100644 Test/Resources/assemblies/TypeDefinitionDebugInformation.pdb

diff --git a/Directory.Build.props b/Directory.Build.props
index 5b9f0da9d..a37508076 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,7 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\cecil.snk</AssemblyOriginatorKeyFile>
     <DefineConstants Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net8.0' ">$(DefineConstants);NET_CORE</DefineConstants>
     <RootNamespace></RootNamespace>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
diff --git a/Mono.Cecil.Cil/PortablePdb.cs b/Mono.Cecil.Cil/PortablePdb.cs
index 6664bee32..4f58ebf52 100644
--- a/Mono.Cecil.Cil/PortablePdb.cs
+++ b/Mono.Cecil.Cil/PortablePdb.cs
@@ -13,6 +13,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Security.Cryptography;
+using Mono.Collections.Generic;
 using Mono.Cecil.Metadata;
 using Mono.Cecil.PE;
 
@@ -145,6 +146,11 @@ void ReadStateMachineKickOffMethod (MethodDebugInformation method_info)
 			method_info.kickoff_method = debug_reader.ReadStateMachineKickoffMethod (method_info.method);
 		}
 
+		public Collection<CustomDebugInformation> Read (ICustomDebugInformationProvider provider)
+		{
+			return debug_reader.GetCustomDebugInformation (provider);
+		}
+
 		void ReadCustomDebugInformations (MethodDebugInformation info)
 		{
 			info.method.custom_infos = debug_reader.GetCustomDebugInformation (info.method);
@@ -221,6 +227,11 @@ public MethodDebugInformation Read (MethodDefinition method)
 			return reader.Read (method);
 		}
 
+		public Collection<CustomDebugInformation> Read (ICustomDebugInformationProvider provider)
+		{
+			return reader.Read (provider);
+		}
+
 		public void Dispose ()
 		{
 			reader.Dispose ();
@@ -319,6 +330,11 @@ public void Write ()
 			}
 		}
 
+		public void Write (ICustomDebugInformationProvider provider)
+		{
+			pdb_metadata.AddCustomDebugInformations (provider);
+		}
+
 		public ImageDebugHeader GetDebugHeader ()
 		{
 			if (IsEmbedded)
@@ -519,6 +535,11 @@ public void Write (MethodDebugInformation info)
 			writer.Write (info);
 		}
 
+		public void Write (ICustomDebugInformationProvider provider)
+		{
+			writer.Write (provider);
+		}
+
 		public ImageDebugHeader GetDebugHeader ()
 		{
 			ImageDebugHeader pdbDebugHeader = writer.GetDebugHeader ();
diff --git a/Mono.Cecil.Cil/Symbols.cs b/Mono.Cecil.Cil/Symbols.cs
index 744e7a82b..294eb16db 100644
--- a/Mono.Cecil.Cil/Symbols.cs
+++ b/Mono.Cecil.Cil/Symbols.cs
@@ -854,6 +854,7 @@ public interface ISymbolReader : IDisposable {
 		ISymbolWriterProvider GetWriterProvider ();
 		bool ProcessDebugHeader (ImageDebugHeader header);
 		MethodDebugInformation Read (MethodDefinition method);
+		Collection<CustomDebugInformation> Read (ICustomDebugInformationProvider provider);
 	}
 
 	public interface ISymbolReaderProvider {
@@ -1116,6 +1117,7 @@ public interface ISymbolWriter : IDisposable {
 		ImageDebugHeader GetDebugHeader ();
 		void Write (MethodDebugInformation info);
 		void Write ();
+		void Write (ICustomDebugInformationProvider provider);
 	}
 
 	public interface ISymbolWriterProvider {
@@ -1224,5 +1226,40 @@ public static bool IsPortablePdb (Stream stream)
 				stream.Position = position;
 			}
 		}
+
+		public static bool GetHasCustomDebugInformations (
+			this ICustomDebugInformationProvider self,
+			ref Collection<CustomDebugInformation> collection,
+			ModuleDefinition module)
+		{
+			if (module.HasImage ()) {
+				module.Read (ref collection, self, static (provider, reader) => {
+					var symbol_reader = reader.module.symbol_reader;
+					if (symbol_reader != null)
+						return symbol_reader.Read (provider);
+					return null;
+				});
+			}
+
+			return !collection.IsNullOrEmpty ();
+		}
+
+		public static Collection<CustomDebugInformation> GetCustomDebugInformations (
+			this ICustomDebugInformationProvider self,
+			ref Collection<CustomDebugInformation> collection,
+			ModuleDefinition module)
+		{
+			if (module.HasImage ()) {
+				module.Read (ref collection, self, static (provider, reader) => {
+					var symbol_reader = reader.module.symbol_reader;
+					if (symbol_reader != null)
+						return symbol_reader.Read (provider);
+					return null;
+				});
+			}
+
+			Interlocked.CompareExchange (ref collection, new Collection<CustomDebugInformation> (), null);
+			return collection;
+		}
 	}
 }
diff --git a/Mono.Cecil/AssemblyReader.cs b/Mono.Cecil/AssemblyReader.cs
index 4564071e8..a21d0a966 100644
--- a/Mono.Cecil/AssemblyReader.cs
+++ b/Mono.Cecil/AssemblyReader.cs
@@ -404,6 +404,7 @@ void ReadTypesSymbols (Collection<TypeDefinition> types, ISymbolReader symbol_re
 		{
 			for (int i = 0; i < types.Count; i++) {
 				var type = types [i];
+				type.custom_infos = symbol_reader.Read (type);
 
 				if (type.HasNestedTypes)
 					ReadTypesSymbols (type.NestedTypes, symbol_reader);
@@ -3160,6 +3161,17 @@ void InitializeCustomDebugInformations ()
 			}
 		}
 
+		public bool HasCustomDebugInformation (ICustomDebugInformationProvider provider)
+		{
+			InitializeCustomDebugInformations ();
+
+			Row<Guid, uint, uint> [] rows;
+			if (!metadata.CustomDebugInformations.TryGetValue (provider.MetadataToken, out rows))
+				return false;
+
+			return rows.Length > 0;
+		}
+
 		public Collection<CustomDebugInformation> GetCustomDebugInformation (ICustomDebugInformationProvider provider)
 		{
 			InitializeCustomDebugInformations ();
diff --git a/Mono.Cecil/AssemblyWriter.cs b/Mono.Cecil/AssemblyWriter.cs
index 836aa2172..ee234c81f 100644
--- a/Mono.Cecil/AssemblyWriter.cs
+++ b/Mono.Cecil/AssemblyWriter.cs
@@ -1487,6 +1487,9 @@ void AddType (TypeDefinition type)
 			if (type.HasNestedTypes)
 				AddNestedTypes (type);
 
+			if (symbol_writer != null && type.HasCustomDebugInformations)
+				symbol_writer.Write (type);
+
 			WindowsRuntimeProjections.ApplyProjection (type, treatment);
 		}
 
diff --git a/Mono.Cecil/TypeDefinition.cs b/Mono.Cecil/TypeDefinition.cs
index 872e4c253..92d6ab299 100644
--- a/Mono.Cecil/TypeDefinition.cs
+++ b/Mono.Cecil/TypeDefinition.cs
@@ -10,12 +10,13 @@
 
 using System;
 using System.Threading;
+using Mono.Cecil.Cil;
 using Mono.Cecil.Metadata;
 using Mono.Collections.Generic;
 
 namespace Mono.Cecil {
 
-	public sealed class TypeDefinition : TypeReference, IMemberDefinition, ISecurityDeclarationProvider {
+	public sealed class TypeDefinition : TypeReference, IMemberDefinition, ISecurityDeclarationProvider, ICustomDebugInformationProvider {
 
 		uint attributes;
 		TypeReference base_type;
@@ -34,6 +35,8 @@ public sealed class TypeDefinition : TypeReference, IMemberDefinition, ISecurity
 		Collection<CustomAttribute> custom_attributes;
 		Collection<SecurityDeclaration> security_declarations;
 
+		internal Collection<CustomDebugInformation> custom_infos;
+
 		public TypeAttributes Attributes {
 			get { return (TypeAttributes) attributes; }
 			set {
@@ -284,6 +287,19 @@ public override Collection<GenericParameter> GenericParameters {
 			get { return generic_parameters ?? (this.GetGenericParameters (ref generic_parameters, Module)); }
 		}
 
+		public bool HasCustomDebugInformations {
+			get {
+				if (custom_infos != null)
+					return custom_infos.Count > 0;
+
+				return this.GetHasCustomDebugInformations (ref custom_infos, Module);
+			}
+		}
+
+		public Collection<CustomDebugInformation> CustomDebugInformations {
+			get { return custom_infos ?? (this.GetCustomDebugInformations (ref custom_infos, module)); }
+		}
+
 		#region TypeAttributes
 
 		public bool IsNotPublic {
diff --git a/Test/Mono.Cecil.Tests/BaseTestFixture.cs b/Test/Mono.Cecil.Tests/BaseTestFixture.cs
index 046791bfa..12de4227a 100644
--- a/Test/Mono.Cecil.Tests/BaseTestFixture.cs
+++ b/Test/Mono.Cecil.Tests/BaseTestFixture.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using Mono.Cecil.Cil;
+using Mono.Cecil.Pdb;
 using NUnit.Framework;
 
 using Mono.Cecil.PE;
@@ -154,6 +155,54 @@ static void Run (TestCase testCase)
 			using (var runner = new TestRunner (testCase, TestCaseType.WriteFromImmediate))
 				runner.RunTest ();
 		}
+
+		public enum RoundtripType {
+			None,
+			Pdb,
+			PortablePdb
+		}
+
+		protected static ModuleDefinition RoundtripModule(ModuleDefinition module, RoundtripType roundtripType)
+		{
+			if (roundtripType == RoundtripType.None)
+				return module;
+
+			var file = Path.Combine (Path.GetTempPath (), "RoundtripModule.dll");
+			if (File.Exists (file))
+				File.Delete (file);
+
+			ISymbolWriterProvider symbolWriterProvider;
+			switch (roundtripType) {
+			case RoundtripType.Pdb when Platform.HasNativePdbSupport:
+				symbolWriterProvider = new PdbWriterProvider ();
+				break;
+			case RoundtripType.PortablePdb:
+			default:
+				symbolWriterProvider = new PortablePdbWriterProvider ();
+				break;
+			}
+
+			module.Write (file, new WriterParameters {
+				SymbolWriterProvider = symbolWriterProvider,
+			});
+			module.Dispose ();
+
+			ISymbolReaderProvider symbolReaderProvider;
+			switch (roundtripType) {
+			case RoundtripType.Pdb when Platform.HasNativePdbSupport:
+				symbolReaderProvider = new PdbReaderProvider ();
+				break;
+			case RoundtripType.PortablePdb:
+			default:
+				symbolReaderProvider = new PortablePdbReaderProvider ();
+				break;
+			}
+
+			return ModuleDefinition.ReadModule (file, new ReaderParameters {
+				SymbolReaderProvider = symbolReaderProvider,
+				InMemory = true
+			});
+		}
 	}
 
 	abstract class TestCase {
diff --git a/Test/Mono.Cecil.Tests/ILProcessorTests.cs b/Test/Mono.Cecil.Tests/ILProcessorTests.cs
index fd462c365..93ca078c8 100644
--- a/Test/Mono.Cecil.Tests/ILProcessorTests.cs
+++ b/Test/Mono.Cecil.Tests/ILProcessorTests.cs
@@ -3,10 +3,8 @@
 using System.IO;
 using System.Linq;
 
-using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Mdb;
-using Mono.Cecil.Pdb;
 using NUnit.Framework;
 
 namespace Mono.Cecil.Tests {
@@ -499,12 +497,6 @@ static MethodBody CreateTestMethodWithLocalScopes (RoundtripType roundtripType,
 			return methodBody;
 		}
 
-		public enum RoundtripType {
-			None,
-			Pdb,
-			PortablePdb
-		}
-
 		static MethodBody RoundtripMethodBody(MethodBody methodBody, RoundtripType roundtripType, bool forceUnresolvedScopes = false, bool reverseScopeOrder = false)
 		{
 			var newModule = RoundtripModule (methodBody.Method.Module, roundtripType);
@@ -540,47 +532,5 @@ static void ReverseScopeOrder(ScopeDebugInformation scope)
 			foreach (var subScope in scope.Scopes)
 				ReverseScopeOrder (subScope);
 		}
-
-		static ModuleDefinition RoundtripModule(ModuleDefinition module, RoundtripType roundtripType)
-		{
-			if (roundtripType == RoundtripType.None)
-				return module;
-
-			var file = Path.Combine (Path.GetTempPath (), "TestILProcessor.dll");
-			if (File.Exists (file))
-				File.Delete (file);
-
-			ISymbolWriterProvider symbolWriterProvider;
-			switch (roundtripType) {
-			case RoundtripType.Pdb when Platform.HasNativePdbSupport:
-				symbolWriterProvider = new PdbWriterProvider ();
-				break;
-			case RoundtripType.PortablePdb:
-			default:
-				symbolWriterProvider = new PortablePdbWriterProvider ();
-				break;
-			}
-
-			module.Write (file, new WriterParameters {
-				SymbolWriterProvider = symbolWriterProvider,
-			});
-			module.Dispose ();
-
-			ISymbolReaderProvider symbolReaderProvider;
-			switch (roundtripType) {
-			case RoundtripType.Pdb when Platform.HasNativePdbSupport:
-				symbolReaderProvider = new PdbReaderProvider ();
-				break;
-			case RoundtripType.PortablePdb:
-			default:
-				symbolReaderProvider = new PortablePdbReaderProvider ();
-				break;
-			}
-
-			return ModuleDefinition.ReadModule (file, new ReaderParameters {
-				SymbolReaderProvider = symbolReaderProvider,
-				InMemory = true
-			});
-		}
 	}
 }
diff --git a/Test/Mono.Cecil.Tests/PortablePdbTests.cs b/Test/Mono.Cecil.Tests/PortablePdbTests.cs
index a89f79d83..c2b04524b 100644
--- a/Test/Mono.Cecil.Tests/PortablePdbTests.cs
+++ b/Test/Mono.Cecil.Tests/PortablePdbTests.cs
@@ -646,6 +646,43 @@ public void PortablePdbLineInfo()
 			}, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider));
 		}
 
+		[Test]
+		public void TypeDefinitionDebugInformation ()
+		{
+			TestModule ("TypeDefinitionDebugInformation.dll", module => {
+				var enum_type = module.GetType ("TypeDefinitionDebugInformation.Enum");
+				Assert.IsTrue (enum_type.HasCustomDebugInformations);
+				var binary_custom_debug_info = enum_type.CustomDebugInformations.OfType<BinaryCustomDebugInformation> ().FirstOrDefault ();
+				Assert.IsNotNull (binary_custom_debug_info);
+				Assert.AreEqual (new Guid ("932E74BC-DBA9-4478-8D46-0F32A7BAB3D3"), binary_custom_debug_info.Identifier);
+				Assert.AreEqual (new byte [] { 0x1 }, binary_custom_debug_info.Data);
+
+				var interface_type = module.GetType ("TypeDefinitionDebugInformation.Interface");
+				Assert.IsTrue (interface_type.HasCustomDebugInformations);
+				binary_custom_debug_info = interface_type.CustomDebugInformations.OfType<BinaryCustomDebugInformation> ().FirstOrDefault ();
+				Assert.IsNotNull (binary_custom_debug_info);
+				Assert.AreEqual (new Guid ("932E74BC-DBA9-4478-8D46-0F32A7BAB3D3"), binary_custom_debug_info.Identifier);
+				Assert.AreEqual (new byte [] { 0x1 }, binary_custom_debug_info.Data);
+			}, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider));
+		}
+
+		[Test]
+		public void ModifyTypeDefinitionDebugInformation ()
+		{
+			using (var module = GetResourceModule ("TypeDefinitionDebugInformation.dll", new ReaderParameters { SymbolReaderProvider = new PortablePdbReaderProvider () })) {
+				var enum_type = module.GetType ("TypeDefinitionDebugInformation.Enum");
+				var binary_custom_debug_info = enum_type.CustomDebugInformations.OfType<BinaryCustomDebugInformation> ().FirstOrDefault ();
+				Assert.AreEqual (new byte [] { 0x1 }, binary_custom_debug_info.Data);
+				binary_custom_debug_info.Data = new byte [] { 0x2 };
+
+				var outputModule = RoundtripModule (module, RoundtripType.None);
+				enum_type = outputModule.GetType ("TypeDefinitionDebugInformation.Enum");
+				binary_custom_debug_info = enum_type.CustomDebugInformations.OfType<BinaryCustomDebugInformation> ().FirstOrDefault ();
+				Assert.IsNotNull (binary_custom_debug_info);
+				Assert.AreEqual (new byte [] { 0x2 }, binary_custom_debug_info.Data);
+			}
+		}
+
 		public sealed class SymbolWriterProvider : ISymbolWriterProvider {
 
 			readonly DefaultSymbolWriterProvider writer_provider = new DefaultSymbolWriterProvider ();
@@ -730,6 +767,11 @@ public void Write ()
 				symbol_writer.Write ();
 			}
 
+			public void Write (ICustomDebugInformationProvider provider)
+			{
+				symbol_writer.Write (provider);
+			}
+
 			public void Dispose ()
 			{
 				symbol_writer.Dispose ();
diff --git a/Test/Resources/assemblies/TypeDefinitionDebugInformation.dll b/Test/Resources/assemblies/TypeDefinitionDebugInformation.dll
new file mode 100644
index 0000000000000000000000000000000000000000..6b41377d0a42ba73d66b64b18b966cd1d813986b
GIT binary patch
literal 4608
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

literal 0
HcmV?d00001

diff --git a/Test/Resources/assemblies/TypeDefinitionDebugInformation.pdb b/Test/Resources/assemblies/TypeDefinitionDebugInformation.pdb
new file mode 100644
index 0000000000000000000000000000000000000000..954231334a251c8a049ba022a54448cff17aac6d
GIT binary patch
literal 7604
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
UKVee&oJ2G8u?HWEz<+@L54C>wy#N3J

literal 0
HcmV?d00001

diff --git a/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs b/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs
index 3e2dd18e4..f19212f60 100644
--- a/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs
+++ b/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs
@@ -186,6 +186,11 @@ SequencePoint LineToSequencePoint (LineNumberEntry line)
 			};
 		}
 
+		public Collection<CustomDebugInformation> Read (ICustomDebugInformationProvider provider)
+		{
+			return new Collection<CustomDebugInformation> ();
+		}
+
 		public void Dispose ()
 		{
 			symbol_file.Dispose ();
diff --git a/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs b/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs
index 4d4ce933b..81a0d539d 100644
--- a/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs
+++ b/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs
@@ -173,6 +173,10 @@ public void Write ()
 			// after the entire image of the assembly is written (since it's computed from the hash of that)
 		}
 
+		public void Write (ICustomDebugInformationProvider provider)
+		{
+		}
+
 		public void Dispose ()
 		{
 			writer.WriteSymbolFile (module.Mvid);
diff --git a/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs b/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs
index 484704447..400fb0b48 100644
--- a/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs
+++ b/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs
@@ -355,6 +355,11 @@ Document GetDocument (PdbSource source)
 			return document;
 		}
 
+		public Collection<CustomDebugInformation> Read (ICustomDebugInformationProvider provider)
+		{
+			return new Collection<CustomDebugInformation> ();
+		}
+
 		public void Dispose ()
 		{
 			pdb_file.Dispose ();
diff --git a/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs b/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
index 9597d7fa4..55515d5e5 100644
--- a/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
+++ b/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
@@ -265,6 +265,10 @@ public void Write ()
 			writer.Close ();
 		}
 
+		public void Write (ICustomDebugInformationProvider provider)
+		{
+		}
+
 		public void Dispose ()
 		{
 			writer.Close ();