Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Match xplat event source conditions #56435

Merged
merged 2 commits into from
Aug 2, 2021
Merged

Match xplat event source conditions #56435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
726b93c
Match xplat event source conditions
am11 Jul 27, 2021
ef85f7d
Fix formatting
am11 Jul 27, 2021
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
2 changes: 1 addition & 1 deletion src/coreclr/clr.featuredefines.props
View file
Open in desktop
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
View file
Open in desktop
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