Skip to content

Fix Crossgen2 PDB generator #70407

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
trylek merged 2 commits into from
Jun 9, 2022
Merged

Fix Crossgen2 PDB generator #70407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36eedbe
Fix Crossgen2 PDB generator
trylek Jun 7, 2022
c58f168
Fix COM object release per Aaron's PR feedback
trylek Jun 8, 2022
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
7 changes: 6 additions & 1 deletion 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 @@ -218,7 +218,12 @@ private void WritePDBDataHelper(string dllPath, IEnumerable<MethodInfo> methods)
const int capacity = 1024;
var pdbFilePathBuilder = new char[capacity];
_ngenWriter.QueryPDBNameExW(pdbFilePathBuilder, new IntPtr(capacity - 1) /* remove 1 byte for null */);
_pdbFilePath = pdbFilePathBuilder.ToString();
int length = 0;
while (length < pdbFilePathBuilder.Length && pdbFilePathBuilder[length] != '\0')
{
length++;
}
_pdbFilePath = new string(pdbFilePathBuilder, 0, length);
}

_ngenWriter.OpenModW(originalDllPath, Path.GetFileName(originalDllPath), out _pdbMod);
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/tools/aot/ILCompiler.Diagnostics/SymNgenWriterWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ private SymNgenWriterWrapper(IntPtr writer2Inst)
{
var iid = ISymNGenWriter2.IID;
int hr = Marshal.QueryInterface(ptr, ref iid, out IntPtr ngenWriterInst);
Marshal.Release(ptr);
if (hr != 0)
{
return null;
Expand Down