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

fix for il to native mapping etw events #15038

Merged
merged 2 commits into from
Nov 17, 2017
Merged

Conversation

davmason
Copy link
Member

Fix for #14947, previously the il to native mapping ETW events would always emit events for the same native code version, this change fixes that.

@noahfalk
Copy link
Member

LGTM

@@ -3133,7 +3133,7 @@ HRESULT Debugger::GetILToNativeMapping(UINT_PTR pNativeCodeStartAddress, ULONG32
//

HRESULT Debugger::GetILToNativeMappingIntoArrays(
MethodDesc * pMD,
UINT_PTR pCode,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use PCODE for code addresses?

@@ -3157,7 +3157,7 @@ HRESULT Debugger::GetILToNativeMappingIntoArrays(

// Get the JIT info by functionId.

DebuggerJitInfo * pDJI = GetLatestJitInfoFromMethodDesc(pMD);
DebuggerJitInfo * pDJI = GetJitInfoFromAddr(pCode);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Converting code address back to MethodDesc is not cheap operation. It would be better to use GetJitInfo overload that takes both code address and MethodDesc to avoid this lookup.

@davmason
Copy link
Member Author

I am investigating the test failures and will merge when I understand or fix the arm and mac failures, they seem to be deterministic and I want to understand more. I was sidetracked by other work items but will hopefully have it by tomorrow.

@davmason
Copy link
Member Author

@dotnet-bot test OSX10.12 x64 Checked Innerloop Build and Test

@davmason
Copy link
Member Author

@dotnet-bot test Ubuntu armlb Cross Debug Innerloop Build

@davmason davmason merged commit 30fb27b into dotnet:master Nov 17, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
3 participants