Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Fix GetSequencePoints when profiler provides mapping via SetILInstrumentedCodeMap #25802

Merged
merged 2 commits into from
Jul 24, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/debug/daccess/dacdbiimpl.cpp
Original file line number Diff line number Diff line change
@@ -1006,10 +1006,10 @@ void DacDbiInterfaceImpl::GetSequencePoints(MethodDesc * pMethodDesc,
// if there is a rejit IL map for this function, apply that in preference to load-time mapping
#ifdef FEATURE_REJIT
CodeVersionManager * pCodeVersionManager = pMethodDesc->GetCodeVersionManager();
NativeCodeVersion nativeCodeVersion = pCodeVersionManager->GetNativeCodeVersion(dac_cast<PTR_MethodDesc>(pMethodDesc), (PCODE)startAddr);
if (!nativeCodeVersion.IsNull())
ILCodeVersion ilVersion = pCodeVersionManager->GetNativeCodeVersion(dac_cast<PTR_MethodDesc>(pMethodDesc), (PCODE)startAddr).GetILCodeVersion();
davmason marked this conversation as resolved.
Show resolved Hide resolved
if (!ilVersion.IsDefaultVersion())
{
const InstrumentedILOffsetMapping * pRejitMapping = nativeCodeVersion.GetILCodeVersion().GetInstrumentedILMap();
const InstrumentedILOffsetMapping * pRejitMapping = ilVersion.GetInstrumentedILMap();
ComposeMapping(pRejitMapping, mapCopy, &entryCount);
}
else