From 726b93c048af37c05102f258953627591117afa3 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 28 Jul 2021 01:01:32 +0300
Subject: [PATCH 1/2] Match xplat event source conditions

---
 src/coreclr/clr.featuredefines.props | 2 +-
 src/coreclr/vm/ecall.cpp             | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props
index 08fca8de6dd644..a070c467581e17 100644
--- a/src/coreclr/clr.featuredefines.props
+++ b/src/coreclr/clr.featuredefines.props
@@ -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>
diff --git a/src/coreclr/vm/ecall.cpp b/src/coreclr/vm/ecall.cpp
index c6d1b6d2f1eddd..3879a98410c1f0 100644
--- a/src/coreclr/vm/ecall.cpp
+++ b/src/coreclr/vm/ecall.cpp
@@ -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

From ef85f7dac8a1a09eb350635e1bdf1a0441c5b2bb Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 28 Jul 2021 01:15:36 +0300
Subject: [PATCH 2/2] Fix formatting

---
 src/coreclr/vm/ecall.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/vm/ecall.cpp b/src/coreclr/vm/ecall.cpp
index 3879a98410c1f0..3dd1c44aa26498 100644
--- a/src/coreclr/vm/ecall.cpp
+++ b/src/coreclr/vm/ecall.cpp
@@ -661,9 +661,9 @@ LPVOID ECall::GetQCallImpl(MethodDesc * pMD)
         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));
+        CONSISTENCY_CHECK_MSGF(id != 0,
+            ("%s::%s is not registered in ecall.cpp",
+            pMD->m_pszDebugClassName, pMD->m_pszDebugMethodName));
 #endif
 
         _ASSERTE(id != 0);