diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2018-11-29 12:44:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 12:44:04 -0800 |
| commit | 11d1b645f0dede73ded0030b56d7c506150b0741 (patch) | |
| tree | 279600e72cf717e3133210765f99541afd59341f /src/vm/method.cpp | |
| parent | 211d963a42c8988770afa4d2edcbe9be0ed0b8a8 (diff) | |
| download | coreclr-11d1b645f0dede73ded0030b56d7c506150b0741.tar.gz coreclr-11d1b645f0dede73ded0030b56d7c506150b0741.tar.bz2 coreclr-11d1b645f0dede73ded0030b56d7c506150b0741.zip | |
Enable type equivalence (#21265)
* Enable TypeEquivalence feature for Windows platform
* Basic test - verified test exercises TypeEquivalence code paths
Diffstat (limited to 'src/vm/method.cpp')
| -rw-r--r-- | src/vm/method.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/vm/method.cpp b/src/vm/method.cpp index 3c2ba7d17f..9c19c688ac 100644 --- a/src/vm/method.cpp +++ b/src/vm/method.cpp @@ -5407,7 +5407,7 @@ moveToNextToken: #ifdef FEATURE_TYPEEQUIVALENCE -void CheckForEquivalenceAndLoadType(Module *pModule, mdToken token, Module *pDefModule, mdToken defToken, const SigParser *ptr, SigTypeContext *pTypeContext, void *pData) +static void CheckForEquivalenceAndLoadType(Module *pModule, mdToken token, Module *pDefModule, mdToken defToken, const SigParser *ptr, SigTypeContext *pTypeContext, void *pData) { CONTRACTL { @@ -5426,9 +5426,11 @@ void CheckForEquivalenceAndLoadType(Module *pModule, mdToken token, Module *pDef TypeHandle th = sigPtr.GetTypeHandleThrowing(pModule, pTypeContext); } } +#endif // FEATURE_TYPEEQUIVALENCE BOOL MethodDesc::HasTypeEquivalentStructParameters() { +#ifdef FEATURE_TYPEEQUIVALENCE CONTRACTL { THROWS; @@ -5447,9 +5449,14 @@ BOOL MethodDesc::HasTypeEquivalentStructParameters() SetDoesNotHaveEquivalentValuetypeParameters(); return fHasTypeEquivalentStructParameters; -} + +#else + LIMITED_METHOD_CONTRACT; + return FALSE; #endif // FEATURE_TYPEEQUIVALENCE +} + PrecodeType MethodDesc::GetPrecodeType() { |