diff options
| author | Pat Gavlin <pgavlin@gmail.com> | 2016-05-03 09:18:51 -0700 |
|---|---|---|
| committer | Pat Gavlin <pgavlin@gmail.com> | 2016-05-03 09:18:51 -0700 |
| commit | 92f671fe9f0fc583805d4f9c3116126444dabcf4 (patch) | |
| tree | 28e1e7146b4be4dfffc25ca011a102548ea1d154 | |
| parent | eabea995f603cbd38cc1a5fdebe305737e13b5ad (diff) | |
| parent | 8686653b0266b82a5ffb6d7aca4116d72c88df86 (diff) | |
| download | coreclr-92f671fe9f0fc583805d4f9c3116126444dabcf4.tar.gz coreclr-92f671fe9f0fc583805d4f9c3116126444dabcf4.tar.bz2 coreclr-92f671fe9f0fc583805d4f9c3116126444dabcf4.zip | |
Merge pull request #4728 from pgavlin/FixTRTContracts
Fix contracts in `tryResolveToken`.
| -rw-r--r-- | src/vm/jitinterface.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index 2cf2ab4838..ab7940cc47 100644 --- a/src/vm/jitinterface.cpp +++ b/src/vm/jitinterface.cpp @@ -817,14 +817,14 @@ BOOL CEEInfo::isValidToken ( { CONTRACTL { SO_TOLERANT; - THROWS; - GC_TRIGGERS; - MODE_PREEMPTIVE; + NOTHROW; + GC_NOTRIGGER; + MODE_ANY; } CONTRACTL_END; BOOL result = FALSE; - JIT_TO_EE_TRANSITION(); + JIT_TO_EE_TRANSITION_LEAF(); if (IsDynamicScope(module)) { @@ -837,7 +837,7 @@ BOOL CEEInfo::isValidToken ( result = ((Module *)module)->GetMDImport()->IsValidToken(metaTOK); } - EE_TO_JIT_TRANSITION(); + EE_TO_JIT_TRANSITION_LEAF(); return result; } @@ -1302,7 +1302,12 @@ struct TryResolveTokenFilterParam bool isValidTokenForTryResolveToken(CEEInfo* info, CORINFO_RESOLVED_TOKEN* resolvedToken) { - LIMITED_METHOD_CONTRACT; + CONTRACTL { + NOTHROW; + GC_NOTRIGGER; + SO_TOLERANT; + MODE_ANY; + } CONTRACTL_END; if (!info->isValidToken(resolvedToken->tokenScope, resolvedToken->token)) { |