From: Steve MacLean <Steve.MacLean@microsoft.com>
Date: Thu, 19 Mar 2020 21:10:36 +0000 (-0400)
Subject: Fix LoadNativeSymbols for cross-dac (#929)
X-Git-Tag: submit/tizen_5.5/20200504.045052~11^2^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c99b4b11744158c1660d17b193c6f3f271de770;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Fix LoadNativeSymbols for cross-dac (#929)
---

diff --git a/src/SOS/SOS.NETCore/SymbolReader.cs b/src/SOS/SOS.NETCore/SymbolReader.cs
index 2cd025443..1ee618093 100644
--- a/src/SOS/SOS.NETCore/SymbolReader.cs
+++ b/src/SOS/SOS.NETCore/SymbolReader.cs
@@ -282,7 +282,16 @@ namespace SOS
                 else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
                     var peFile = new PEFile(new StreamAddressSpace(stream), true);
-                    generator = new PEFileKeyGenerator(s_tracer, peFile, moduleFilePath);
+                    if (peFile.IsValid())
+                    {
+                        generator = new PEFileKeyGenerator(s_tracer, peFile, moduleFilePath);
+                    }
+                    else
+                    {
+                        // Support loading ELF files on Windows for the cross-dac
+                        var elfFile = new ELFFile(new StreamAddressSpace(stream), 0, true);
+                        generator = new ELFFileKeyGenerator(s_tracer, elfFile, moduleFilePath);
+                    }
                 }
                 else {
                     return;