From: Dmitri-Botcharnikov <dmitry.b@samsung.com>
Date: Fri, 27 May 2016 16:53:10 +0000 (+0400)
Subject: Fix sos ClrStack print of GC frames for ARM/Linux (dotnet/coreclr#5178)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~10350
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9d540be8eca8e72d98dd7bc0658f6b0c8fd1355;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix sos ClrStack print of GC frames for ARM/Linux (dotnet/coreclr#5178)

Fix issue dotnet/coreclr#5037

Commit migrated from https://github.com/dotnet/coreclr/commit/29333fab30bb15139b8ed8c09a56d994ba8e3e6f
---

diff --git a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
index d567e3c..e89043d 100644
--- a/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
+++ b/src/coreclr/src/ToolBox/SOS/Strike/strike.cpp
@@ -13408,7 +13408,7 @@ Exit:
             {
                 DWORD_PTR vtAddr;
                 MOVE(vtAddr, TO_TADDR(FrameData.frameAddr));
-                if (g_sos->GetFrameName(vtAddr, 1024, wszNameBuffer, NULL) == S_OK)
+                if (g_sos->GetFrameName(TO_CDADDR(vtAddr), 1024, wszNameBuffer, NULL) == S_OK)
                     ExtDbgOut("[%ls: %08x] ", wszNameBuffer, FrameData.frameAddr);  
                 else
                     ExtDbgOut("[Frame: %08x] ", FrameData.frameAddr);
diff --git a/src/coreclr/src/ToolBox/SOS/Strike/util.cpp b/src/coreclr/src/ToolBox/SOS/Strike/util.cpp
index e3fac08..fc728ad 100644
--- a/src/coreclr/src/ToolBox/SOS/Strike/util.cpp
+++ b/src/coreclr/src/ToolBox/SOS/Strike/util.cpp
@@ -6467,7 +6467,7 @@ WString GetFrameFromAddress(TADDR frameAddr, IXCLRDataStackWalk *pStackWalk, BOO
     WString frameOutput;
     frameOutput += W("[");
 
-    if (SUCCEEDED(g_sos->GetFrameName(vtAddr, mdNameLen, g_mdName, NULL)))
+    if (SUCCEEDED(g_sos->GetFrameName(TO_CDADDR(vtAddr), mdNameLen, g_mdName, NULL)))
         frameOutput += g_mdName;
     else
         frameOutput += W("Frame");