From 29333fab30bb15139b8ed8c09a56d994ba8e3e6f Mon Sep 17 00:00:00 2001 From: Dmitri-Botcharnikov Date: Fri, 27 May 2016 20:53:10 +0400 Subject: [PATCH] Fix sos ClrStack print of GC frames for ARM/Linux (#5178) Fix issue #5037 --- src/ToolBox/SOS/Strike/strike.cpp | 2 +- src/ToolBox/SOS/Strike/util.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp index d567e3c..e89043d 100644 --- a/src/ToolBox/SOS/Strike/strike.cpp +++ b/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/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp index e3fac08..fc728ad 100644 --- a/src/ToolBox/SOS/Strike/util.cpp +++ b/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"); -- 2.7.4