From: Sung Yoon Whang <suwhang@microsoft.com>
Date: Tue, 26 May 2020 21:55:51 +0000 (-0700)
Subject: merge with master
X-Git-Tag: submit/tizen/20210909.063632~7760^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dfd9370b816c7ef98fa7b50b665935e46fbbfff;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

merge with master
---

1dfd9370b816c7ef98fa7b50b665935e46fbbfff
diff --cc src/coreclr/src/vm/eventtrace.cpp
index ef7f471,0725580..026eec4
--- a/src/coreclr/src/vm/eventtrace.cpp
+++ b/src/coreclr/src/vm/eventtrace.cpp
@@@ -7616,12 -7612,7 +7616,12 @@@ bool EventPipeHelper::IsEnabled(DOTNET_
      }
      CONTRACTL_END
  
 +    if (!Context.EventPipeProvider.IsEnabled)
 +    {
 +        return false;
 +    }
 +
-     if (Level <= Context.EventPipeProvider.Level || Context.EventPipeProvider.Level == 0)
+     if (Level <= Context.EventPipeProvider.Level)
      {
          return (Keyword == (ULONGLONG)0) || (Keyword & Context.EventPipeProvider.EnabledKeywordsBitmask) != 0;
      }