diff options
author | Filip Navara <filip.navara@gmail.com> | 2019-01-23 22:13:01 +0100 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-23 13:13:01 -0800 |
commit | a28b25aacdcd2adb0fdfa70bd869f53ba6565976 (patch) | |
tree | d37eeacbb212a5633edabf93300dbcd18980f13f /src/md | |
parent | 797888982e264e2ecfbc436f782f2f6704644e84 (diff) | |
download | coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.gz coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.tar.bz2 coreclr-a28b25aacdcd2adb0fdfa70bd869f53ba6565976.zip |
Remove all traces of FEATURE_STACK_PROBE. (#22149)
Diffstat (limited to 'src/md')
-rw-r--r-- | src/md/compiler/regmeta_import.cpp | 3 | ||||
-rw-r--r-- | src/md/compiler/regmeta_vm.cpp | 4 | ||||
-rw-r--r-- | src/md/enc/mdinternalrw.cpp | 6 | ||||
-rw-r--r-- | src/md/enc/metamodelrw.cpp | 4 | ||||
-rw-r--r-- | src/md/runtime/mdinternaldisp.cpp | 4 |
5 files changed, 0 insertions, 21 deletions
diff --git a/src/md/compiler/regmeta_import.cpp b/src/md/compiler/regmeta_import.cpp index f60fc88af6..67bf9f3b05 100644 --- a/src/md/compiler/regmeta_import.cpp +++ b/src/md/compiler/regmeta_import.cpp @@ -80,9 +80,6 @@ void STDMETHODCALLTYPE RegMeta::CloseEnum( if (pmdEnum == NULL) return; - // This function may be called through RCW. When hosted, we have probed before this call, so the - // following contract violation is OK. - CONTRACT_VIOLATION(SOToleranceViolation); HENUMInternal::DestroyEnum(pmdEnum); END_CLEANUP_ENTRYPOINT; } // RegMeta::CloseEnum diff --git a/src/md/compiler/regmeta_vm.cpp b/src/md/compiler/regmeta_vm.cpp index 4b227add89..de9ace909d 100644 --- a/src/md/compiler/regmeta_vm.cpp +++ b/src/md/compiler/regmeta_vm.cpp @@ -252,10 +252,6 @@ ErrExit: // Thus Release() is in a satellite lib. ULONG RegMeta::Release() { - // This is called during cleanup. We can not fail this call by probing. - // As long as we make sure the cleanup does not use too much space through - // BEGIN_CLEANUP_ENTRYPOINT, we are OK. - CONTRACT_VIOLATION (SOToleranceViolation); BEGIN_CLEANUP_ENTRYPOINT; #if defined(FEATURE_METADATA_IN_VM) diff --git a/src/md/enc/mdinternalrw.cpp b/src/md/enc/mdinternalrw.cpp index 75c793967e..c8f844d625 100644 --- a/src/md/enc/mdinternalrw.cpp +++ b/src/md/enc/mdinternalrw.cpp @@ -2425,8 +2425,6 @@ MDInternalRW::GetNestedClassProps( HRESULT hr = NOERROR; RID rid; - BEGIN_SO_INTOLERANT_CODE_NO_THROW_CHECK_THREAD(return COR_E_STACKOVERFLOW); - LOCKREAD(); if (!m_pStgdb->m_MiniMd.IsSorted(TBL_NestedClass) && !m_pStgdb->m_MiniMd.IsTableVirtualSorted(TBL_NestedClass)) @@ -2454,7 +2452,6 @@ MDInternalRW::GetNestedClassProps( } ErrExit: - END_SO_INTOLERANT_CODE; return hr; } // MDInternalRW::GetNestedClassProps @@ -4334,9 +4331,6 @@ HRESULT MDInternalRW::ApplyEditAndContinue( _ASSERTE(pDeltaMD); _ASSERTE(ppv); - // debugging-specific usages don't need SO hardening - SO_NOT_MAINLINE_FUNCTION; - HRESULT hr = E_FAIL; IMDInternalImportENC *pDeltaMDImport = NULL; diff --git a/src/md/enc/metamodelrw.cpp b/src/md/enc/metamodelrw.cpp index 6a3bc327ef..74b6b87233 100644 --- a/src/md/enc/metamodelrw.cpp +++ b/src/md/enc/metamodelrw.cpp @@ -1805,8 +1805,6 @@ CMiniMdRW::ConvertToRW() if (IsMinimalDelta()) return CLDB_E_INCOMPATIBLE; - BEGIN_SO_INTOLERANT_CODE_NO_THROW_CHECK_THREAD(return COR_E_STACKOVERFLOW); - IfFailGo(m_StringHeap.MakeWritable()); IfFailGo(m_GuidHeap.MakeWritable()); IfFailGo(m_UserStringHeap.MakeWritable()); @@ -1828,8 +1826,6 @@ CMiniMdRW::ConvertToRW() m_fIsReadOnly = false; ErrExit: - ; - END_SO_INTOLERANT_CODE; return hr; } // CMiniMdRW::ConvertToRW diff --git a/src/md/runtime/mdinternaldisp.cpp b/src/md/runtime/mdinternaldisp.cpp index 6498b359c0..ffed8bb715 100644 --- a/src/md/runtime/mdinternaldisp.cpp +++ b/src/md/runtime/mdinternaldisp.cpp @@ -170,8 +170,6 @@ STDAPI GetMDInternalInterface( IMDCommon *pInternalROMDCommon = NULL; MDFileFormat format; - BEGIN_SO_INTOLERANT_CODE_NO_THROW_CHECK_THREAD(return COR_E_STACKOVERFLOW); - if (ppIUnk == NULL) IfFailGo(E_INVALIDARG); @@ -215,8 +213,6 @@ ErrExit: if ( pInternalROMDCommon ) pInternalROMDCommon->Release(); - END_SO_INTOLERANT_CODE; - return hr; } // GetMDInternalInterface |