Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 2 commits into from
Jan 16, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d322a
Fix Crossgen2 PDB generation (again)
trylek Jan 5, 2024
5f824e0
Simplify the change per JanK's PR feedback
trylek Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix Crossgen2 PDB generation (again)
  • Loading branch information
@trylek
trylek authored and github-actions committed Jan 5, 2024
commit e2d322a2ff17b5b816ba1ea0ee3e9e1ded9e281b
15 changes: 11 additions & 4 deletions src/coreclr/tools/aot/ILCompiler.Diagnostics/PdbWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public partial class PdbWriter
Dictionary<SymDocument,int> _documentToChecksumOffsetMapping;

UIntPtr _pdbMod;
IntPtr _pdbWriterInst;
ISymNGenWriter2 _ngenWriter;

static PdbWriter()
Expand Down Expand Up @@ -143,9 +144,15 @@ 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();
Marshal.Release(_pdbWriterInst);
}
}

Expand Down Expand Up @@ -209,8 +216,8 @@ private void WritePDBDataHelper(string dllPath, IEnumerable<MethodInfo> methods)
File.Delete(_pdbFilePath);

var comWrapper = new StrategyBasedComWrappers();
CreateNGenPdbWriter(dllPath, _pdbFilePath, out var pdbWriterInst);
_ngenWriter = (ISymNGenWriter2)comWrapper.GetOrCreateObjectForComInstance(pdbWriterInst, CreateObjectFlags.UniqueInstance);
CreateNGenPdbWriter(dllPath, _pdbFilePath, out _pdbWriterInst);
_ngenWriter = (ISymNGenWriter2)comWrapper.GetOrCreateObjectForComInstance(_pdbWriterInst, CreateObjectFlags.UniqueInstance);

{
// PDB file is now created. Get its path and update _pdbFilePath so the PDB file
Expand Down