summaryrefslogtreecommitdiff
path: root/src/gc
diff options
context:
space:
mode:
authorFilip Navara <filip.navara@gmail.com>2019-01-23 22:13:01 +0100
committerJan Kotas <jkotas@microsoft.com>2019-01-23 13:13:01 -0800
commita28b25aacdcd2adb0fdfa70bd869f53ba6565976 (patch)
treed37eeacbb212a5633edabf93300dbcd18980f13f /src/gc
parent797888982e264e2ecfbc436f782f2f6704644e84 (diff)
downloadcoreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.gz
coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.bz2
coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.zip
Remove all traces of FEATURE_STACK_PROBE. (#22149)
Diffstat (limited to 'src/gc')
-rw-r--r--src/gc/env/gcenv.base.h3
-rw-r--r--src/gc/gc.cpp2
-rw-r--r--src/gc/handletable.cpp7
-rw-r--r--src/gc/handletable.inl2
-rw-r--r--src/gc/handletablecache.cpp1
-rw-r--r--src/gc/handletablescan.cpp1
-rw-r--r--src/gc/objecthandle.cpp2
7 files changed, 0 insertions, 18 deletions
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h
index 187d9ca723..d982cae4fe 100644
--- a/src/gc/env/gcenv.base.h
+++ b/src/gc/env/gcenv.base.h
@@ -406,7 +406,6 @@ typedef struct _PROCESSOR_NUMBER {
#define STATIC_CONTRACT_DEBUG_ONLY
#define STATIC_CONTRACT_NOTHROW
#define STATIC_CONTRACT_CAN_TAKE_LOCK
-#define STATIC_CONTRACT_SO_TOLERANT
#define STATIC_CONTRACT_GC_NOTRIGGER
#define STATIC_CONTRACT_MODE_COOPERATIVE
#define CONTRACTL
@@ -417,8 +416,6 @@ typedef struct _PROCESSOR_NUMBER {
#define INSTANCE_CHECK
#define MODE_COOPERATIVE
#define MODE_ANY
-#define SO_INTOLERANT
-#define SO_TOLERANT
#define GC_TRIGGERS
#define GC_NOTRIGGER
#define CAN_TAKE_LOCK
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp
index 921da851ea..a748174cc7 100644
--- a/src/gc/gc.cpp
+++ b/src/gc/gc.cpp
@@ -34149,8 +34149,6 @@ BOOL GCHeap::IsInFrozenSegment (Object * object)
// returns TRUE if the pointer is in one of the GC heaps.
bool GCHeap::IsHeapPointer (void* vpObject, bool small_heap_only)
{
- STATIC_CONTRACT_SO_TOLERANT;
-
// removed STATIC_CONTRACT_CAN_TAKE_LOCK here because find_segment
// no longer calls GCEvent::Wait which eventually takes a lock.
diff --git a/src/gc/handletable.cpp b/src/gc/handletable.cpp
index b2a0e09263..2232c455f5 100644
--- a/src/gc/handletable.cpp
+++ b/src/gc/handletable.cpp
@@ -297,7 +297,6 @@ OBJECTHANDLE HndCreateHandle(HHANDLETABLE hTable, uint32_t uType, OBJECTREF obje
{
MODE_ANY;
}
- SO_INTOLERANT;
}
CONTRACTL_END;
@@ -356,7 +355,6 @@ void ValidateFetchObjrefForHandle(OBJECTREF objref, ADIndex appDomainIndex)
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
STATIC_CONTRACT_DEBUG_ONLY;
@@ -374,7 +372,6 @@ void ValidateAssignObjrefForHandle(OBJECTREF objref, ADIndex appDomainIndex)
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
STATIC_CONTRACT_DEBUG_ONLY;
@@ -432,7 +429,6 @@ void HndDestroyHandle(HHANDLETABLE hTable, uint32_t uType, OBJECTHANDLE handle)
NOTHROW;
GC_NOTRIGGER;
MODE_ANY;
- SO_TOLERANT;
CAN_TAKE_LOCK; // because of TableFreeSingleHandleToCache
}
CONTRACTL_END;
@@ -478,7 +474,6 @@ void HndDestroyHandleOfUnknownType(HHANDLETABLE hTable, OBJECTHANDLE handle)
{
NOTHROW;
GC_NOTRIGGER;
- SO_TOLERANT;
MODE_ANY;
}
CONTRACTL_END;
@@ -590,7 +585,6 @@ void HndLogSetEvent(OBJECTHANDLE handle, _UNCHECKED_OBJECTREF value)
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
#if !defined(DACCESS_COMPILE) && defined(FEATURE_EVENT_TRACE)
@@ -646,7 +640,6 @@ void HndWriteBarrier(OBJECTHANDLE handle, OBJECTREF objref)
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
// unwrap the objectref we were given
diff --git a/src/gc/handletable.inl b/src/gc/handletable.inl
index 752a7b01ae..5633302953 100644
--- a/src/gc/handletable.inl
+++ b/src/gc/handletable.inl
@@ -14,7 +14,6 @@ inline void HndAssignHandle(OBJECTHANDLE handle, OBJECTREF objref)
{
NOTHROW;
GC_NOTRIGGER;
- SO_TOLERANT;
MODE_COOPERATIVE;
}
CONTRACTL_END;
@@ -66,7 +65,6 @@ inline BOOL HndFirstAssignHandle(OBJECTHANDLE handle, OBJECTREF objref)
{
NOTHROW;
GC_NOTRIGGER;
- SO_TOLERANT;
MODE_COOPERATIVE;
}
CONTRACTL_END;
diff --git a/src/gc/handletablecache.cpp b/src/gc/handletablecache.cpp
index 918cbc934a..3771efbee2 100644
--- a/src/gc/handletablecache.cpp
+++ b/src/gc/handletablecache.cpp
@@ -772,7 +772,6 @@ void TableFreeSingleHandleToCache(HandleTable *pTable, uint32_t uType, OBJECTHAN
NOTHROW;
GC_NOTRIGGER;
MODE_ANY;
- SO_TOLERANT;
CAN_TAKE_LOCK; // because of TableCacheMissOnFree
}
CONTRACTL_END;
diff --git a/src/gc/handletablescan.cpp b/src/gc/handletablescan.cpp
index 6a39a00472..1c67cb35c4 100644
--- a/src/gc/handletablescan.cpp
+++ b/src/gc/handletablescan.cpp
@@ -787,7 +787,6 @@ void BlockResetAgeMapForBlocksWorker(uint32_t *pdwGen, uint32_t dwClumpMask, Sca
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
// fetch the table segment we are working in
diff --git a/src/gc/objecthandle.cpp b/src/gc/objecthandle.cpp
index 9c459f3ad0..aa1ab57a51 100644
--- a/src/gc/objecthandle.cpp
+++ b/src/gc/objecthandle.cpp
@@ -257,7 +257,6 @@ void CALLBACK PinObject(_UNCHECKED_OBJECTREF *pObjRef, uintptr_t *pExtraInfo, ui
{
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;
- STATIC_CONTRACT_SO_TOLERANT;
STATIC_CONTRACT_MODE_COOPERATIVE;
UNREFERENCED_PARAMETER(pExtraInfo);
@@ -856,7 +855,6 @@ void SetDependentHandleSecondary(OBJECTHANDLE handle, OBJECTREF objref)
{
NOTHROW;
GC_NOTRIGGER;
- SO_TOLERANT;
MODE_COOPERATIVE;
}
CONTRACTL_END;