diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-02-03 06:18:44 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-03 06:18:44 -0800 |
commit | d747b85536994e4c73c3f810d9e7b9cb46e02745 (patch) | |
tree | ef950ddc845ede744fbe30ca248398f0f9997a88 /src/vm/security.inl | |
parent | c92c399cee4c2c772093b67cb6f6cac3d705adc8 (diff) | |
download | coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.tar.gz coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.tar.bz2 coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.zip |
Integrate changes from full .NET Framework
- Custom attribute to suppress NGen with method granularity
- Static contract fixes
- GC fix
[tfs-changeset: 1571860]
Diffstat (limited to 'src/vm/security.inl')
-rw-r--r-- | src/vm/security.inl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/vm/security.inl b/src/vm/security.inl index cc552e1f09..745de2866d 100644 --- a/src/vm/security.inl +++ b/src/vm/security.inl @@ -520,6 +520,7 @@ inline BOOL Security::CheckCriticalAccess(AccessCheckContext* pContext, FieldDesc* pOptionalTargetField, MethodTable * pOptionalTargetType) { + WRAPPER_NO_CONTRACT; return SecurityTransparent::CheckCriticalAccess(pContext, pOptionalTargetMethod, pOptionalTargetField, |