Skip to content
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.

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

Support converting embedded Pdbs to XML #235

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
57 changes: 56 additions & 1 deletion src/Pdb2Xml/PdbToXml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
// See the License.txt file in the project root for more information.

using System;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
using System.Text;

namespace Microsoft.DiaSymReader.Tools
Expand Down Expand Up @@ -162,7 +166,12 @@ public static void Convert(Args args)

if (!File.Exists(pdbFile))
{
throw new FileNotFoundException($"PDB File not found: {pdbFile}");
if (!ProcessEmbeddedPdb(peFile, args.OutputPath, args.Options))
{
throw new FileNotFoundException($"PDB File not found: {pdbFile}");
}

return;
}

if (args.Delta)
Expand All @@ -175,6 +184,52 @@ public static void Convert(Args args)
}
}

public static bool ProcessEmbeddedPdb(string? assemblyFilePath, string outputPath, PdbToXmlOptions options)
{
if (assemblyFilePath == null)
{
return false;
}

MemoryStream? pdbStream = null;

using (var stream = File.OpenRead(assemblyFilePath))
{
var reader = new PEReader(stream);
var metadataReader = reader.GetMetadataReader();
var debugDirectory = reader.ReadDebugDirectory();
foreach (var entry in debugDirectory)
{
if (entry.Type == DebugDirectoryEntryType.EmbeddedPortablePdb && entry.DataSize > 0)
{
var embeddedProvider = reader.ReadEmbeddedPortablePdbDebugDirectoryData(entry);
var memoryBlock = embeddedProvider.GetType().GetMethod("GetMetadataBlock", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(embeddedProvider, null);
var memoryBlockType = memoryBlock.GetType();
var size = (int)memoryBlockType.GetProperty("Size").GetValue(memoryBlock);
var bytes = (ImmutableArray<byte>)memoryBlockType.GetMethod("GetContentUnchecked").Invoke(memoryBlock, new object[] { 0, size });
pdbStream = new MemoryStream(bytes.ToArray());
Comment on lines +205 to +210
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

var pdbStream = new UnmanagedMemoryStream(reader.MetadataPointer, reader.MetadataLength, reader.MetadataLength, FileAccess.Read);

break;
}
}
}

if (pdbStream == null)
{
return false;
}

using (var stream = File.OpenRead(assemblyFilePath))
{
var xmlText = PdbToXmlConverter.ToXml(pdbStream, stream, options);

outputPath = Path.GetFullPath(outputPath);
Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
File.WriteAllText(outputPath, xmlText);
}

return true;
}

public static void GenXmlFromPdb(string exePath, string pdbPath, string outPath, PdbToXmlOptions options)
{
using var peStream = new FileStream(exePath, FileMode.Open, FileAccess.Read);
Expand Down