Avoid unnecessary type loads during JIT-time access checks

src/coreclr/vm/clsload.hpp

@@ -326,6 +326,9 @@ class AccessCheckContext
     Assembly*       m_pCallerAssembly;
 };
 
+class TargetTypeForAccessCheck;
+class TargetMethodForAccessCheck;
+
 //******************************************************************************
 // This type specifies the kind of accessibility checks to perform.
 // On failure, it can be configured to either return FALSE or to throw an exception.
@@ -339,17 +342,6 @@ class AccessCheckOptions
         // CoreCLR: Just do normal accessibility checks.
         kNormalAccessibilityChecks,
 
-        // Used only for resource loading and reflection inovcation when the target is remoted.
-        // Desktop: If normal accessiblity checks fail, return TRUE if a demand for MemberAccess succeeds
-        // CoreCLR: If normal accessiblity checks fail, return TRUE if a the caller is Security(Safe)Critical
-        kMemberAccess,
-
-        // Used by Reflection invocation and DynamicMethod with RestrictedSkipVisibility.
-        // Desktop: If normal accessiblity checks fail, return TRUE if a demand for RestrictedMemberAccess
-        //          and grant set of the target assembly succeeds.
-        // CoreCLR: If normal accessiblity checks fail, return TRUE if the callee is App transparent code (in a user assembly)
-        kRestrictedMemberAccess,
-
         // Used by normal DynamicMethods in full trust CoreCLR
         // CoreCLR: Do normal visibility checks but bypass transparency checks.
         kNormalAccessNoTransparency,
@@ -364,13 +356,13 @@ class AccessCheckOptions
         AccessCheckType      accessCheckType,
         DynamicResolver *    pAccessContext,
         BOOL                 throwIfTargetIsInaccessible,
-        MethodTable *        pTargetMT);
+        TargetTypeForAccessCheck * pTargetType);
 
     AccessCheckOptions(
-        AccessCheckType      accessCheckType,
-        DynamicResolver *    pAccessContext,
-        BOOL                 throwIfTargetIsInaccessible,
-        MethodDesc *         pTargetMD);
+        AccessCheckType            accessCheckType,
+        DynamicResolver *          pAccessContext,
+        BOOL                       throwIfTargetIsInaccessible,
+        TargetMethodForAccessCheck* pTargetMethod);
 
     AccessCheckOptions(
         AccessCheckType      accessCheckType,
@@ -395,7 +387,7 @@ class AccessCheckOptions
         return m_fThrowIfTargetIsInaccessible;
     }
 
-    BOOL DemandMemberAccessOrFail(AccessCheckContext *pContext, MethodTable * pTargetMT, BOOL visibilityCheck) const;
+    BOOL DemandMemberAccessOrFail(AccessCheckContext *pContext, const TargetTypeForAccessCheck& pTargetType, BOOL visibilityCheck) const;
     BOOL FailOrThrow(AccessCheckContext *pContext) const;
 
     static AccessCheckOptions* s_pNormalAccessChecks;
@@ -406,19 +398,19 @@ class AccessCheckOptions
     void Initialize(
         AccessCheckType     accessCheckType,
         BOOL                throwIfTargetIsInaccessible,
-        MethodTable *       pTargetMT,
-        MethodDesc *        pTargetMD,
+        TargetTypeForAccessCheck* pTargetType,
+        TargetMethodForAccessCheck* pTargetMethod,
         FieldDesc *         pTargetFD);
 
-    BOOL DemandMemberAccess(AccessCheckContext *pContext, MethodTable * pTargetMT, BOOL visibilityCheck) const;
+    BOOL DemandMemberAccess(AccessCheckContext *pContext, const TargetTypeForAccessCheck& pTargetType, BOOL visibilityCheck) const;
 
     void ThrowAccessException(
         AccessCheckContext* pContext,
-        MethodTable*        pFailureMT = NULL,
+        const TargetTypeForAccessCheck * pFailureType = NULL,
         Exception*          pInnerException = NULL) const;
 
-    MethodTable *           m_pTargetMT;
-    MethodDesc *            m_pTargetMethod;
+    TargetTypeForAccessCheck* m_pTargetType;
+    TargetMethodForAccessCheck* m_pTargetMethod;
     FieldDesc *             m_pTargetField;
 
     AccessCheckType         m_accessCheckType;
@@ -817,35 +809,46 @@ class ClassLoader
 
     static BOOL CanAccessClass(
         AccessCheckContext*     pContext,
-        MethodTable*            pTargetClass,
+        const TargetTypeForAccessCheck& pTargetClass,
         Assembly*               pTargetAssembly,
         const AccessCheckOptions &  accessCheckOptions = *AccessCheckOptions::s_pNormalAccessChecks);
 
     static BOOL CanAccess(
         AccessCheckContext*     pContext,
-        MethodTable*            pTargetClass,
+        const TargetTypeForAccessCheck& pTargetClass,
         Assembly*               pTargetAssembly,
         DWORD                   dwMemberAttrs,
-        MethodDesc*             pOptionalTargetMethod,
+        const TargetMethodForAccessCheck* pOptionalTargetMethod,
         const AccessCheckOptions &  accessCheckOptions = *AccessCheckOptions::s_pNormalAccessChecks);
 
-private:
+    static BOOL CanAccessInstantiation(
+        AccessCheckContext*     pContext,
+        Instantiation           inst,
+        const AccessCheckOptions & accessCheckOptions);
+
+    static BOOL CanAccessInstantiationBySignature(
+        AccessCheckContext*     pContext,
+        SigPointer              sig,
+        Module*                 module,
+        const AccessCheckOptions & accessCheckOptions);
+
+    private:
     // Access check helpers
     static BOOL CanAccessMethodInstantiation(
         AccessCheckContext*     pContext,
-        MethodDesc*             pOptionalTargetMethod,
+        const TargetMethodForAccessCheck* pOptionalTargetMethod,
         const AccessCheckOptions & accessCheckOptions);
 
     static BOOL CanAccessFamily(
-        MethodTable*            pCurrentClass,
-        MethodTable*            pTargetClass);
+        MethodTable*              pCurrentClass,
+        const TargetTypeForAccessCheck& pTargetClass);
 
     static BOOL CheckAccessMember(
         AccessCheckContext*     pContext,
-        MethodTable*            pTargetClass,
+        const TargetTypeForAccessCheck& pTargetClass,
         Assembly*               pTargetAssembly,
         DWORD                   dwMemberAttrs,
-        MethodDesc*             pOptionalTargetMethod,
+        const TargetMethodForAccessCheck* pOptionalTargetMethod,
         const AccessCheckOptions &  accessCheckOptions = *AccessCheckOptions::s_pNormalAccessChecks);
 
 

src/coreclr/vm/clsload.inl

@@ -61,8 +61,8 @@ inline PTR_Module ClassLoader::ComputeLoaderModuleForParamType(TypeHandle paramT
 inline void AccessCheckOptions::Initialize(
     AccessCheckType      accessCheckType,
     BOOL                 throwIfTargetIsInaccessible,
-    MethodTable *        pTargetMT,
-    MethodDesc *         pTargetMethod,
+    TargetTypeForAccessCheck* pTargetType,
+    TargetMethodForAccessCheck* pTargetMethod,
     FieldDesc *          pTargetField)
 {
     CONTRACTL
@@ -84,7 +84,7 @@ inline void AccessCheckOptions::Initialize(
 
     m_accessCheckType = accessCheckType;
     m_fThrowIfTargetIsInaccessible = throwIfTargetIsInaccessible;
-    m_pTargetMT = pTargetMT;
+    m_pTargetType = pTargetType;
     m_pTargetMethod = pTargetMethod;
     m_pTargetField = pTargetField;
 }
@@ -95,15 +95,15 @@ inline AccessCheckOptions::AccessCheckOptions(
     AccessCheckType      accessCheckType,
     DynamicResolver *    pAccessContext,
     BOOL                 throwIfTargetIsInaccessible,
-    MethodTable *        pTargetMT) :
+    TargetTypeForAccessCheck * pTargetType) :
     m_pAccessContext(pAccessContext)
 {
     WRAPPER_NO_CONTRACT;
 
     Initialize(
         accessCheckType,
         throwIfTargetIsInaccessible,
-        pTargetMT,
+        pTargetType,
         NULL,
         NULL);
 }
@@ -112,7 +112,7 @@ inline AccessCheckOptions::AccessCheckOptions(
     AccessCheckType      accessCheckType,
     DynamicResolver *    pAccessContext,
     BOOL                 throwIfTargetIsInaccessible,
-    MethodDesc *         pTargetMethod) :
+    TargetMethodForAccessCheck* pTargetMethod) :
     m_pAccessContext(pAccessContext)
 {
     WRAPPER_NO_CONTRACT;