From 7621d45e22168805e52da958bd48ad6b790322bd Mon Sep 17 00:00:00 2001
From: Mike McLaughlin <mikem@microsoft.com>
Date: Wed, 3 Jan 2018 10:07:51 -0800
Subject: [PATCH] Fix source/line info on Windows for Windows PDBs. (#14696)
 (#15255)

Now attempts to load the diasymreader from the coreclr module path.

Issue #21079
---
 src/vm/ceeload.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/vm/ceeload.cpp b/src/vm/ceeload.cpp
index 6a1eb629592d..f835af3457ac 100644
--- a/src/vm/ceeload.cpp
+++ b/src/vm/ceeload.cpp
@@ -3893,27 +3893,31 @@ ISymUnmanagedReader *Module::GetISymUnmanagedReader(void)
             // We've got in-memory ILDB symbols, create the ILDB symbol binder
             // Note that in this case, we must be very careful not to use diasymreader.dll
             // at all - we don't trust it, and shouldn't run any code in it
-            IfFailThrow(IldbSymbolsCreateInstance(CLSID_CorSymBinder_SxS,
-                                  IID_ISymUnmanagedBinder,
-                                  (void**)&pBinder));
+            IfFailThrow(IldbSymbolsCreateInstance(CLSID_CorSymBinder_SxS, IID_ISymUnmanagedBinder, (void**)&pBinder));
         }
         else
         {
-            // We're going to be working with PDB format symbols
-            // Attempt to coCreate the symbol binder.
-            // CoreCLR supports not having a symbol reader installed, so this is expected there.
+            // We're going to be working with Windows PDB format symbols. Attempt to CoCreate the symbol binder.
+            // CoreCLR supports not having a symbol reader installed, so CoCreate searches the PATH env var 
+            // and then tries coreclr dll location.
             // On desktop, the framework installer is supposed to install diasymreader.dll as well
             // and so this shouldn't happen.
-            hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS,
-                                        NATIVE_SYMBOL_READER_DLL,
-                                        IID_ISymUnmanagedBinder,
-                                        (void**)&pBinder,
-                                        NULL);
+            hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, NATIVE_SYMBOL_READER_DLL, IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
             if (FAILED(hr))
             {
-                RETURN (NULL);
+                PathString symbolReaderPath;
+                hr = GetHModuleDirectory(GetModuleInst(), symbolReaderPath);
+                if (FAILED(hr))
+                {
+                    RETURN (NULL);
+                }
+                symbolReaderPath.Append(NATIVE_SYMBOL_READER_DLL);
+                hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, symbolReaderPath.GetUnicode(), IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
+                if (FAILED(hr))
+                {
+                    RETURN (NULL);
+                }
             }
-
         }
 
         LOG((LF_CORDB, LL_INFO10, "M::GISUR: Created binder\n"));