diff options
| author | David Mason <davmason@microsoft.com> | 2017-11-17 11:07:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 11:07:31 -0800 |
| commit | 30fb27bec72052e4812b91905d35aada2eab1cca (patch) | |
| tree | 67aa9ac2ecd61611283de6cf7b2a122058bb3c1c /src/vm/eventtrace.cpp | |
| parent | b2b7d2cce110293f14563644c0e1780d0cbe343e (diff) | |
| download | coreclr-30fb27bec72052e4812b91905d35aada2eab1cca.tar.gz coreclr-30fb27bec72052e4812b91905d35aada2eab1cca.tar.bz2 coreclr-30fb27bec72052e4812b91905d35aada2eab1cca.zip | |
fix for il to native mapping etw events (#15038)
After investigation the failures look unrelated to my changes. Thanks Jan and Noah.
Diffstat (limited to 'src/vm/eventtrace.cpp')
| -rw-r--r-- | src/vm/eventtrace.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index 6325edb462..72503d6e19 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -5253,7 +5253,7 @@ VOID ETW::MethodLog::MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrC _ASSERTE(g_pDebugInterface != NULL); g_pDebugInterface->InitializeLazyDataIfNecessary(); - ETW::MethodLog::SendMethodILToNativeMapEvent(pMethodDesc, ETW::EnumerationLog::EnumerationStructs::JitMethodILToNativeMap, rejitID); + ETW::MethodLog::SendMethodILToNativeMapEvent(pMethodDesc, ETW::EnumerationLog::EnumerationStructs::JitMethodILToNativeMap, pCode, rejitID); } } EX_CATCH { } EX_END_CATCH(SwallowAllExceptions); @@ -6664,7 +6664,7 @@ VOID ETW::MethodLog::SendMethodEvent(MethodDesc *pMethodDesc, DWORD dwEventOptio // // static -VOID ETW::MethodLog::SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, ReJITID rejitID) +VOID ETW::MethodLog::SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWORD dwEventOptions, SIZE_T pCode, ReJITID rejitID) { CONTRACTL { @@ -6698,6 +6698,7 @@ VOID ETW::MethodLog::SendMethodILToNativeMapEvent(MethodDesc * pMethodDesc, DWOR HRESULT hr = g_pDebugInterface->GetILToNativeMappingIntoArrays( pMethodDesc, + pCode, kMapEntriesMax, &cMap, &rguiILOffset, @@ -6871,7 +6872,7 @@ VOID ETW::MethodLog::SendEventsForJitMethodsHelper(BaseDomain *pDomainFilter, // Send any supplemental events requested for this MethodID if (fSendILToNativeMapEvent) - ETW::MethodLog::SendMethodILToNativeMapEvent(pMD, dwEventOptions, rejitID); + ETW::MethodLog::SendMethodILToNativeMapEvent(pMD, dwEventOptions, codeStart, rejitID); // When we're called to announce unloads, then the methodunload event itself must // come after any supplemental events, so that the method unload event is the |