diff options
| author | John Chen <jochen@microsoft.com> | 2016-11-29 09:10:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 09:10:40 -0800 |
| commit | e67851210d1c03d730a3bc97a87e8a6713bbf772 (patch) | |
| tree | fb5ebf35580609cb9e6ce2f1ba24c69a46c13c93 /src/vm/reflectioninvocation.cpp | |
| parent | c1e15f43e313d33bb60cdc04131e6cf720d7150f (diff) | |
| download | coreclr-e67851210d1c03d730a3bc97a87e8a6713bbf772.tar.gz coreclr-e67851210d1c03d730a3bc97a87e8a6713bbf772.tar.bz2 coreclr-e67851210d1c03d730a3bc97a87e8a6713bbf772.zip | |
Disable CER feature as it is not used (#8218)
Use FEATURE_CER to scope CER code,
and disable CER feature in CoreCLR.
Diffstat (limited to 'src/vm/reflectioninvocation.cpp')
| -rw-r--r-- | src/vm/reflectioninvocation.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/vm/reflectioninvocation.cpp b/src/vm/reflectioninvocation.cpp index 9847c0575a..4edecdd2c6 100644 --- a/src/vm/reflectioninvocation.cpp +++ b/src/vm/reflectioninvocation.cpp @@ -2508,6 +2508,7 @@ FCIMPL1(void, ReflectionInvocation::PrepareContractedDelegate, Object * delegate } CONTRACTL_END; +#ifdef FEATURE_CER if (delegateUNSAFE == NULL) return; @@ -2517,9 +2518,11 @@ FCIMPL1(void, ReflectionInvocation::PrepareContractedDelegate, Object * delegate PrepareDelegateHelper(&delegate, TRUE); HELPER_METHOD_FRAME_END(); +#endif // FEATURE_CER } FCIMPLEND +#ifdef FEATURE_CER void ReflectionInvocation::PrepareDelegateHelper(OBJECTREF *pDelegate, BOOL onlyContractedMethod) { CONTRACTL { @@ -2601,6 +2604,7 @@ void ReflectionInvocation::PrepareDelegateHelper(OBJECTREF *pDelegate, BOOL only onlyContractedMethod); } } +#endif // FEATURE_CER FCIMPL0(void, ReflectionInvocation::ProbeForSufficientStack) { @@ -2847,6 +2851,7 @@ FCIMPL3(void, ReflectionInvocation::ExecuteCodeWithGuaranteedCleanup, Object* co if (gc.backoutDelegate == NULL) COMPlusThrowArgumentNull(W("backoutCode")); +#ifdef FEATURE_CER if (!IsCompilationProcess()) { // Delegates are prepared as part of the ngen process, so only prepare the backout @@ -2857,6 +2862,7 @@ FCIMPL3(void, ReflectionInvocation::ExecuteCodeWithGuaranteedCleanup, Object* co // attempt to run the backout code. PrepareMethodDesc(g_pExecuteBackoutCodeHelperMethod, Instantiation(), Instantiation(), FALSE, TRUE); } +#endif // FEATURE_CER ExecuteCodeWithGuaranteedCleanupHelper(&gc); |