diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-11-22 14:22:40 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-22 14:22:40 -0800 |
commit | e54dffef08c22a94962aacd93d4793b377cac632 (patch) | |
tree | add9888e42a3c93be7ce63e6f2cbab48e80c4a2e /src/vm/callhelpers.cpp | |
parent | f80f9d5435155cc7a36fbaefa3c8d7da7cc309aa (diff) | |
download | coreclr-e54dffef08c22a94962aacd93d4793b377cac632.tar.gz coreclr-e54dffef08c22a94962aacd93d4793b377cac632.tar.bz2 coreclr-e54dffef08c22a94962aacd93d4793b377cac632.zip |
Delete System.AppDomainSetup (#21157)
* Delete System.AppDomainSetup
Contributes to #21028
* Add test hook for null entry assembly
* Validate that the binder paths are absolute
Diffstat (limited to 'src/vm/callhelpers.cpp')
-rw-r--r-- | src/vm/callhelpers.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/vm/callhelpers.cpp b/src/vm/callhelpers.cpp index 61d6865ff7..7b5396a5f0 100644 --- a/src/vm/callhelpers.cpp +++ b/src/vm/callhelpers.cpp @@ -324,12 +324,6 @@ void FillInRegTypeMap(int argOffset, CorElementType typ, BYTE * pMap) } #endif // CALLDESCR_REGTYPEMAP -#if defined(_DEBUG) && defined(FEATURE_COMINTEROP) -extern int g_fMainThreadApartmentStateSet; -extern int g_fInitializingInitialAD; -extern Volatile<LONG> g_fInExecuteMainMethod; -#endif - //******************************************************************************* #ifdef FEATURE_INTERPRETER void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT *pReturnValue, int cbReturnValue, bool transitionToPreemptive) @@ -355,14 +349,6 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT * MODE_COOPERATIVE; PRECONDITION(GetAppDomain()->CheckCanExecuteManagedCode(m_pMD)); PRECONDITION(m_pMD->CheckActivated()); // EnsureActive will trigger, so we must already be activated - -#ifdef FEATURE_COMINTEROP - // If we're an exe, then we must either be initializing the first AD, or have already setup the main thread's - // COM apartment state. - // If you hit this assert, then you likely introduced code during startup that could inadvertently - // initialize the COM apartment state of the main thread before we set it based on the user attribute. - PRECONDITION(g_fInExecuteMainMethod ? (g_fMainThreadApartmentStateSet || g_fInitializingInitialAD) : TRUE); -#endif // FEATURE_COMINTEROP } CONTRACTL_END; |