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

Commit

Permalink
[automated] Merge branch 'release/2.1' => 'release/2.2' (#27925)
Browse files Browse the repository at this point in the history
* Update CoreClr, CoreFx to servicing-28207-04, servicing-28208-01, respectively (#27899)

* update branding for 2.1 (#27914)

* Fix GetSequencePoints when profiler provides mapping via SetILInstrumentedCodeMap (#27295)

Port #25802 to release/2.1

* Update ILAsmVersion.txt
  • Loading branch information
dotnet-maestro-bot authored and Anipik committed Nov 22, 2019
1 parent c7a0d96 commit 7ef9cd2
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/debug/daccess/dacdbiimpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1002,13 +1002,19 @@ void DacDbiInterfaceImpl::GetSequencePoints(MethodDesc * pMethodDesc,
if (!success)
ThrowHR(E_FAIL);

// 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();
ILCodeVersion ilVersion;
NativeCodeVersion nativeCodeVersion = pCodeVersionManager->GetNativeCodeVersion(dac_cast<PTR_MethodDesc>(pMethodDesc), (PCODE)startAddr);
if (!nativeCodeVersion.IsNull())
{
const InstrumentedILOffsetMapping * pRejitMapping = nativeCodeVersion.GetILCodeVersion().GetInstrumentedILMap();
ilVersion = nativeCodeVersion.GetILCodeVersion();
}

// if there is a rejit IL map for this function, apply that in preference to load-time mapping
if (!ilVersion.IsNull() && !ilVersion.IsDefaultVersion())
{
const InstrumentedILOffsetMapping * pRejitMapping = ilVersion.GetInstrumentedILMap();
ComposeMapping(pRejitMapping, mapCopy, &entryCount);
}
else
Expand Down

0 comments on commit 7ef9cd2

Please sign in to comment.