Fix document checksums in emitted pdbs (dotnet#110097)

mikelle-rogers · Dec 4, 2024 · 209e102 · 209e102
1 parent 6601ad2
commit 209e102
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/ModuleBuilderImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/ModuleBuilderImpl.cs
@@ -603,7 +603,7 @@ private DocumentHandle AddDocument(string url, Guid language, Guid hashAlgorithm
             _pdbBuilder.AddDocument(
                 name: _pdbBuilder.GetOrAddDocumentName(url),
                 hashAlgorithm: hashAlgorithm == default ? default : _pdbBuilder.GetOrAddGuid(hashAlgorithm),
-                hash: hash == null ? default : _metadataBuilder.GetOrAddBlob(hash),
+                hash: hash == null ? default : _pdbBuilder.GetOrAddBlob(hash),
                 language: language == default ? default : _pdbBuilder.GetOrAddGuid(language));
 
         private void FillMemberReferences(ILGeneratorImpl il)

diff --git a/src/libraries/System.Reflection.Emit/tests/PortablePdb/PortablePdbStandalonePdbTest.cs b/src/libraries/System.Reflection.Emit/tests/PortablePdb/PortablePdbStandalonePdbTest.cs
@@ -61,7 +61,8 @@ private static void ValidatePDB(MethodBuilder method, MethodBuilder entryPoint,
             Document doc = reader.GetDocument(docEnumerator.Current);
             Assert.Equal("MySourceFile.cs", reader.GetString(doc.Name));
             Assert.Equal(SymLanguageType.CSharp, reader.GetGuid(doc.Language));
-            Assert.Equal(default, reader.GetGuid(doc.HashAlgorithm));
+            Assert.Equal(new Guid("8829d00f-11b8-4213-878b-770e8597ac16"), reader.GetGuid(doc.HashAlgorithm));
+            Assert.Equal("06CBAB3A501306FDD9176A00A83E5BB92EA4D7863CFD666355743527CF99EDC6", Convert.ToHexString(reader.GetBlobBytes(doc.Hash)));
             Assert.False(docEnumerator.MoveNext());
 
             MethodDebugInformation mdi1 = reader.GetMethodDebugInformation(MetadataTokens.MethodDebugInformationHandle(method.MetadataToken));
@@ -147,6 +148,7 @@ private static MetadataBuilder GenerateAssemblyAndMetadata(out MethodBuilder met
             ModuleBuilder mb = ab.DefineDynamicModule("MyModule2");
             TypeBuilder tb = mb.DefineType("MyType", TypeAttributes.Public | TypeAttributes.Class);
             ISymbolDocumentWriter srcdoc = mb.DefineDocument("MySourceFile.cs", SymLanguageType.CSharp);
+            srcdoc.SetCheckSum(new Guid("8829d00f-11b8-4213-878b-770e8597ac16"), Convert.FromHexString("06CBAB3A501306FDD9176A00A83E5BB92EA4D7863CFD666355743527CF99EDC6"));
             method = tb.DefineMethod("SumMethod", MethodAttributes.Public | MethodAttributes.Static, typeof(int), [typeof(int), typeof(int)]);
             ILGenerator il1 = method.GetILGenerator();
             LocalBuilder local = il1.DeclareLocal(typeof(int));