diff options
| author | noahfalk <noahfalk@microsoft.com> | 2017-10-11 02:23:51 -0700 |
|---|---|---|
| committer | noahfalk <noahfalk@microsoft.com> | 2017-10-11 02:23:51 -0700 |
| commit | bf7e02ba3ad9c69466f94d2d7f849c225ca9d16e (patch) | |
| tree | 3176aae142c6c5f1ff04622109c35c432400aa3d /src/debug/ee | |
| parent | faca87ae7fd06c520fc0458a81b5b4a99a1c5e72 (diff) | |
| download | coreclr-bf7e02ba3ad9c69466f94d2d7f849c225ca9d16e.tar.gz coreclr-bf7e02ba3ad9c69466f94d2d7f849c225ca9d16e.tar.bz2 coreclr-bf7e02ba3ad9c69466f94d2d7f849c225ca9d16e.zip | |
Fix #14428
Now using an offset calculation that is correct for all of a method's jitted code versions.
Diffstat (limited to 'src/debug/ee')
| -rw-r--r-- | src/debug/ee/controller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/debug/ee/controller.cpp b/src/debug/ee/controller.cpp index 3a87fdf166..cba5d88296 100644 --- a/src/debug/ee/controller.cpp +++ b/src/debug/ee/controller.cpp @@ -5582,7 +5582,9 @@ bool DebuggerStepper::TrapStepInHelper( _ASSERTE( g_pEEInterface->IsManagedNativeCode((const BYTE *)td.GetAddress()) ); md = g_pEEInterface->GetNativeCodeMethodDesc(td.GetAddress()); - if ( g_pEEInterface->GetFunctionAddress(md) == td.GetAddress()) + DebuggerJitInfo* pDJI = g_pDebugger->GetJitInfoFromAddr(td.GetAddress()); + CodeRegionInfo code = CodeRegionInfo::GetCodeRegionInfo(pDJI, md); + if (code.AddressToOffset((const BYTE *)td.GetAddress()) == 0) { LOG((LF_CORDB,LL_INFO1000,"\tDS::TS 0x%x m_reason = STEP_CALL" |