Skip to content

Commit

Permalink
Match xplat event source conditions (#56435)
Browse files Browse the repository at this point in the history
  • Loading branch information
am11 committed Aug 2, 2021
1 parent 4e05e94 commit f83a9d9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/coreclr/clr.featuredefines.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
<FeatureXplatEventSource Condition="'$(TargetOS)'!='OSX'">true</FeatureXplatEventSource>
<FeatureXplatEventSource Condition="'$(TargetOS)' == 'Linux'">true</FeatureXplatEventSource>

<FeatureArrayStubAsIL>true</FeatureArrayStubAsIL>
<FeatureMulticastStubAsIL>true</FeatureMulticastStubAsIL>
Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/vm/ecall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,13 @@ LPVOID ECall::GetQCallImpl(MethodDesc * pMD)
if (id == 0)
{
id = ECall::GetIDForMethod(pMD);

#ifdef _DEBUG
CONSISTENCY_CHECK_MSGF(id != 0,
("%s::%s is not registered in ecall.cpp",
pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName));
#endif

_ASSERTE(id != 0);

// Cache the id
Expand Down

0 comments on commit f83a9d9

Please sign in to comment.