[release/8.0-staging] Fix Crossgen2 PDB generation (again) (#96566)

github-actions[bot] · trylek · web-flow · commit f9d0a7b6678e · 2024-01-16T10:33:45.000-08:00
* Fix Crossgen2 PDB generation (again)

* Simplify the change per JanK's PR feedback

---------

Co-authored-by: Tomáš Rylek &lt;trylek@microsoft.com&gt;
diff --git a/src/coreclr/tools/aot/ILCompiler.Diagnostics/PdbWriter.cs b/src/coreclr/tools/aot/ILCompiler.Diagnostics/PdbWriter.cs
@@ -143,9 +143,14 @@ public void WritePDBData(string dllPath, IEnumerable<MethodInfo> methods)
                 }
                 finally
                 {
-                    if ((_ngenWriter != null) && (_pdbMod != UIntPtr.Zero))
+                    if (_ngenWriter != null)
                     {
-                        _ngenWriter.CloseMod(_pdbMod);
+                        if (_pdbMod != UIntPtr.Zero)
+                        {
+                            _ngenWriter.CloseMod(_pdbMod);
+                        }
+                        ComObject ngenWriterComObject = (ComObject)(object)_ngenWriter;
+                        ngenWriterComObject.FinalRelease();
                     }
                 }
 
@@ -211,6 +216,7 @@ private void WritePDBDataHelper(string dllPath, IEnumerable<MethodInfo> methods)
             var comWrapper = new StrategyBasedComWrappers();
             CreateNGenPdbWriter(dllPath, _pdbFilePath, out var pdbWriterInst);
             _ngenWriter = (ISymNGenWriter2)comWrapper.GetOrCreateObjectForComInstance(pdbWriterInst, CreateObjectFlags.UniqueInstance);
+            Marshal.Release(pdbWriterInst);
 
             {
                 // PDB file is now created. Get its path and update _pdbFilePath so the PDB file

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,14 @@ public void WritePDBData(string dllPath, IEnumerable<MethodInfo> methods)`
`143`	`143`	`}`
`144`	`144`	`finally`
`145`	`145`	`{`
`146`		`- if ((_ngenWriter != null) && (_pdbMod != UIntPtr.Zero))`
	`146`	`+ if (_ngenWriter != null)`
`147`	`147`	`{`
`148`		`- _ngenWriter.CloseMod(_pdbMod);`
	`148`	`+ if (_pdbMod != UIntPtr.Zero)`
	`149`	`+ {`
	`150`	`+ _ngenWriter.CloseMod(_pdbMod);`
	`151`	`+ }`
	`152`	`+ ComObject ngenWriterComObject = (ComObject)(object)_ngenWriter;`
	`153`	`+ ngenWriterComObject.FinalRelease();`
`149`	`154`	`}`
`150`	`155`	`}`
`151`	`156`
`@@ -211,6 +216,7 @@ private void WritePDBDataHelper(string dllPath, IEnumerable<MethodInfo> methods)`
`211`	`216`	`var comWrapper = new StrategyBasedComWrappers();`
`212`	`217`	`CreateNGenPdbWriter(dllPath, _pdbFilePath, out var pdbWriterInst);`
`213`	`218`	`_ngenWriter = (ISymNGenWriter2)comWrapper.GetOrCreateObjectForComInstance(pdbWriterInst, CreateObjectFlags.UniqueInstance);`
	`219`	`+ Marshal.Release(pdbWriterInst);`
`214`	`220`
`215`	`221`	`{`
`216`	`222`	`// PDB file is now created. Get its path and update _pdbFilePath so the PDB file`