diff options
Diffstat (limited to 'src/classlibnative')
-rw-r--r-- | src/classlibnative/bcltype/arraynative.cpp | 4 | ||||
-rw-r--r-- | src/classlibnative/bcltype/arraynative.inl | 3 | ||||
-rw-r--r-- | src/classlibnative/bcltype/system.cpp | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/src/classlibnative/bcltype/arraynative.cpp b/src/classlibnative/bcltype/arraynative.cpp index eb5cfd9340..c99cb5c21e 100644 --- a/src/classlibnative/bcltype/arraynative.cpp +++ b/src/classlibnative/bcltype/arraynative.cpp @@ -165,7 +165,6 @@ void ArrayInitializeWorker(ARRAYBASEREF * arrayRef, MethodTable* pElemMT) { STATIC_CONTRACT_MODE_COOPERATIVE; - STATIC_CONTRACT_SO_INTOLERANT; // Ensure that the array element type is fully loaded before executing its code pElemMT->EnsureInstanceActive(); @@ -283,7 +282,6 @@ ArrayNative::AssignArrayEnum ArrayNative::CanAssignArrayTypeNoGC(const BASEARRAY NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; PRECONDITION(pSrc != NULL); PRECONDITION(pDest != NULL); } @@ -888,7 +886,6 @@ void memmoveGCRefs(void *dest, const void *src, size_t len) NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; } CONTRACTL_END; @@ -916,7 +913,6 @@ void ArrayNative::ArrayCopyNoTypeCheck(BASEARRAYREF pSrc, unsigned int srcIndex, NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; PRECONDITION(pSrc != NULL); PRECONDITION(srcIndex >= 0); PRECONDITION(pDest != NULL); diff --git a/src/classlibnative/bcltype/arraynative.inl b/src/classlibnative/bcltype/arraynative.inl index b29e1a9b73..492d4fb3d8 100644 --- a/src/classlibnative/bcltype/arraynative.inl +++ b/src/classlibnative/bcltype/arraynative.inl @@ -21,7 +21,6 @@ FORCEINLINE void InlinedForwardGCSafeCopyHelper(void *dest, const void *src, siz NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; } CONTRACTL_END; @@ -156,7 +155,6 @@ FORCEINLINE void InlinedBackwardGCSafeCopyHelper(void *dest, const void *src, si NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; } CONTRACTL_END; @@ -294,7 +292,6 @@ FORCEINLINE void InlinedMemmoveGCRefsHelper(void *dest, const void *src, size_t NOTHROW; GC_NOTRIGGER; MODE_COOPERATIVE; - SO_TOLERANT; } CONTRACTL_END; diff --git a/src/classlibnative/bcltype/system.cpp b/src/classlibnative/bcltype/system.cpp index bd1db8f146..944cda0837 100644 --- a/src/classlibnative/bcltype/system.cpp +++ b/src/classlibnative/bcltype/system.cpp @@ -379,7 +379,6 @@ void SystemNative::GenericFailFast(STRINGREF refMesgString, EXCEPTIONREF refExce THROWS; GC_TRIGGERS; MODE_COOPERATIVE; - SO_TOLERANT; }CONTRACTL_END; struct @@ -481,7 +480,6 @@ void SystemNative::GenericFailFast(STRINGREF refMesgString, EXCEPTIONREF refExce // skip this, if required. if (IsWatsonEnabled()) { - BEGIN_SO_INTOLERANT_CODE(pThread); if ((gc.refExceptionForWatsonBucketing == NULL) || !SetupWatsonBucketsForFailFast(gc.refExceptionForWatsonBucketing)) { PTR_EHWatsonBucketTracker pUEWatsonBucketTracker = pThread->GetExceptionState()->GetUEWatsonBucketTracker(); @@ -493,7 +491,6 @@ void SystemNative::GenericFailFast(STRINGREF refMesgString, EXCEPTIONREF refExce pUEWatsonBucketTracker->ClearWatsonBucketDetails(); } } - END_SO_INTOLERANT_CODE; } #endif // !FEATURE_PAL |