Imported Upstream version 1.0.0.9127upstream/1.0.0.9127

1 files changed, 4 insertions, 9 deletions

diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/ActivityTracker.cs b/src/mscorlib/src/System/Diagnostics/Eventing/ActivityTracker.cs
index a7124a26ff..1a1f5fa2c0 100644
--- a/src/mscorlib/src/System/Diagnostics/Eventing/ActivityTracker.cs
+++ b/src/mscorlib/src/System/Diagnostics/Eventing/ActivityTracker.cs
@@ -72,7 +72,7 @@ namespace System.Diagnostics.Tracing
             }
 
 
-            Contract.Assert((options & EventActivityOptions.Disable) == 0);
+            Debug.Assert((options & EventActivityOptions.Disable) == 0);
 
             var currentActivity = m_current.Value;
             var fullActivityName = NormalizeActivityName(providerName, activityName, task);
@@ -191,7 +191,7 @@ namespace System.Diagnostics.Tracing
                     else
                     {
                         orphan.m_stopped = 1;
-                        Contract.Assert(orphan.m_stopped != 0);
+                        Debug.Assert(orphan.m_stopped != 0);
                     }
                     orphan = orphan.m_creator;
                 }
@@ -221,7 +221,6 @@ namespace System.Diagnostics.Tracing
         /// <summary>
         /// Turns on activity tracking.    It is sticky, once on it stays on (race issues otherwise)
         /// </summary>
-        [System.Security.SecuritySafeCritical]
         public void Enable()
         {
             if (m_current == null)
@@ -366,7 +365,6 @@ namespace System.Diagnostics.Tracing
             /// byte (since the top nibble can't be zero you can determine if this is true by seeing if 
             /// this byte is nonZero.   This offset is needed to efficiently create the ID for child activities. 
             /// </summary>
-            [System.Security.SecuritySafeCritical]
             private unsafe void CreateActivityPathGuid(out Guid idRet, out int activityPathGuidOffset)
             {
                 fixed (Guid* outPtr = &idRet)
@@ -403,7 +401,6 @@ namespace System.Diagnostics.Tracing
             /// sufficient space for this ID.   By doing this, we preserve the fact that this activity
             /// is a child (of unknown depth) from that ancestor.
             /// </summary>
-            [System.Security.SecurityCritical]
             private unsafe void CreateOverflowGuid(Guid* outPtr)
             {
                 // Search backwards for an ancestor that has sufficient space to put the ID.  
@@ -452,7 +449,6 @@ namespace System.Diagnostics.Tracing
             /// is the maximum number of bytes that fit in a GUID) if the path did not fit.  
             /// If 'overflow' is true, then the number is encoded as an 'overflow number (which has a
             /// special (longer prefix) that indicates that this ID is allocated differently 
-            [System.Security.SecurityCritical]
             private static unsafe int AddIdToGuid(Guid* outPtr, int whereToAddId, uint id, bool overflow = false)
             {
                 byte* ptr = (byte*)outPtr;
@@ -526,11 +522,10 @@ namespace System.Diagnostics.Tracing
             /// Thus if it is non-zero it adds to the current byte, otherwise it advances and writes
             /// the new byte (in the high bits) of the next byte.  
             /// </summary>
-            [System.Security.SecurityCritical]
             private static unsafe void WriteNibble(ref byte* ptr, byte* endPtr, uint value)
             {
-                Contract.Assert(0 <= value && value < 16);
-                Contract.Assert(ptr < endPtr);
+                Debug.Assert(0 <= value && value < 16);
+                Debug.Assert(ptr < endPtr);
 
                 if (*ptr != 0)
                     *ptr++ |= (byte)value;