diff --git a/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h b/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h index 19feffab4719..d8ea0e3c2960 100644 --- a/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h +++ b/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h @@ -150,9 +150,6 @@ BOOL isCompatibleDelegate(CORINFO_CLASS_HANDLE objCls, /* type of the BOOL* pfIsOpenDelegate /* is the delegate open */ ); -// Determines whether the delegate creation obeys security transparency rules -BOOL isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, CORINFO_METHOD_HANDLE calleeHnd); - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification CorInfoInstantiationVerification isInstantiationOfVerifiedGeneric(CORINFO_METHOD_HANDLE method /* IN */ diff --git a/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp index 4741cf1354d6..0f22d5f9bd82 100644 --- a/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp @@ -303,15 +303,6 @@ BOOL interceptor_ICJI::isCompatibleDelegate( return temp; } -// Determines whether the delegate creation obeys security transparency rules -BOOL interceptor_ICJI::isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, CORINFO_METHOD_HANDLE calleeHnd) -{ - mc->cr->AddCall("isDelegateCreationAllowed"); - BOOL temp = original_ICorJitInfo->isDelegateCreationAllowed(delegateHnd, calleeHnd); - mc->recIsDelegateCreationAllowed(delegateHnd, calleeHnd, temp); - return temp; -} - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification CorInfoInstantiationVerification interceptor_ICJI::isInstantiationOfVerifiedGeneric(CORINFO_METHOD_HANDLE method /* IN diff --git a/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp index 1d45229655fe..361548162fbf 100644 --- a/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp @@ -217,13 +217,6 @@ BOOL interceptor_ICJI::isCompatibleDelegate( return original_ICorJitInfo->isCompatibleDelegate(objCls, methodParentCls, method, delegateCls, pfIsOpenDelegate); } -// Determines whether the delegate creation obeys security transparency rules -BOOL interceptor_ICJI::isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, CORINFO_METHOD_HANDLE calleeHnd) -{ - mcs->AddCall("isDelegateCreationAllowed"); - return original_ICorJitInfo->isDelegateCreationAllowed(delegateHnd, calleeHnd); -} - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification CorInfoInstantiationVerification interceptor_ICJI::isInstantiationOfVerifiedGeneric(CORINFO_METHOD_HANDLE method /* IN diff --git a/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp index aca75361a089..07996ff57179 100644 --- a/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp @@ -198,12 +198,6 @@ BOOL interceptor_ICJI::isCompatibleDelegate( return original_ICorJitInfo->isCompatibleDelegate(objCls, methodParentCls, method, delegateCls, pfIsOpenDelegate); } -// Determines whether the delegate creation obeys security transparency rules -BOOL interceptor_ICJI::isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, CORINFO_METHOD_HANDLE calleeHnd) -{ - return original_ICorJitInfo->isDelegateCreationAllowed(delegateHnd, calleeHnd); -} - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification CorInfoInstantiationVerification interceptor_ICJI::isInstantiationOfVerifiedGeneric(CORINFO_METHOD_HANDLE method /* IN diff --git a/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp index 59ad3c5e409f..93511123c089 100644 --- a/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp +++ b/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp @@ -238,13 +238,6 @@ BOOL MyICJI::isCompatibleDelegate(CORINFO_CLASS_HANDLE objCls, /* type return jitInstance->mc->repIsCompatibleDelegate(objCls, methodParentCls, method, delegateCls, pfIsOpenDelegate); } -// Determines whether the delegate creation obeys security transparency rules -BOOL MyICJI::isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, CORINFO_METHOD_HANDLE calleeHnd) -{ - jitInstance->mc->cr->AddCall("isDelegateCreationAllowed"); - return jitInstance->mc->repIsDelegateCreationAllowed(delegateHnd, calleeHnd); -} - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification CorInfoInstantiationVerification MyICJI::isInstantiationOfVerifiedGeneric(CORINFO_METHOD_HANDLE method /* IN */ diff --git a/src/inc/corinfo.h b/src/inc/corinfo.h index 2495de2516b8..25226253e6a3 100644 --- a/src/inc/corinfo.h +++ b/src/inc/corinfo.h @@ -2111,13 +2111,6 @@ class ICorStaticInfo BOOL *pfIsOpenDelegate /* is the delegate open */ ) = 0; - // Determines whether the delegate creation obeys security transparency rules - virtual BOOL isDelegateCreationAllowed ( - CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd - ) = 0; - - // Indicates if the method is an instance of the generic // method that passes (or has passed) verification virtual CorInfoInstantiationVerification isInstantiationOfVerifiedGeneric ( diff --git a/src/jit/ICorJitInfo_API_names.h b/src/jit/ICorJitInfo_API_names.h index 601afbdfe1ae..3cc29589d024 100644 --- a/src/jit/ICorJitInfo_API_names.h +++ b/src/jit/ICorJitInfo_API_names.h @@ -20,7 +20,6 @@ DEF_CLR_API(getUnmanagedCallConv) DEF_CLR_API(pInvokeMarshalingRequired) DEF_CLR_API(satisfiesMethodConstraints) DEF_CLR_API(isCompatibleDelegate) -DEF_CLR_API(isDelegateCreationAllowed) DEF_CLR_API(isInstantiationOfVerifiedGeneric) DEF_CLR_API(initConstraintsForVerification) DEF_CLR_API(canSkipMethodVerification) diff --git a/src/jit/ICorJitInfo_API_wrapper.hpp b/src/jit/ICorJitInfo_API_wrapper.hpp index a3ad21165bb9..6a71fb883ad0 100644 --- a/src/jit/ICorJitInfo_API_wrapper.hpp +++ b/src/jit/ICorJitInfo_API_wrapper.hpp @@ -189,17 +189,6 @@ BOOL WrapICorJitInfo::isCompatibleDelegate( return temp; } -BOOL WrapICorJitInfo::isDelegateCreationAllowed( - CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd) -{ - API_ENTER(isDelegateCreationAllowed); - BOOL temp = wrapHnd->isDelegateCreationAllowed(delegateHnd, calleeHnd); - API_LEAVE(isDelegateCreationAllowed); - return temp; -} - - CorInfoInstantiationVerification WrapICorJitInfo::isInstantiationOfVerifiedGeneric( CORINFO_METHOD_HANDLE method /* IN */) { diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index ef0e87fb3a00..cc72d876f23f 100644 --- a/src/vm/jitinterface.cpp +++ b/src/vm/jitinterface.cpp @@ -9579,21 +9579,6 @@ BOOL CEEInfo::isCompatibleDelegate( return result; } -// Determines whether the delegate creation obeys security transparency rules -BOOL CEEInfo::isDelegateCreationAllowed ( - CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd) -{ - CONTRACTL { - SO_TOLERANT; - THROWS; - GC_TRIGGERS; - MODE_PREEMPTIVE; - } CONTRACTL_END; - - return TRUE; -} - /*********************************************************************/ // return the unmanaged target *if method has already been prelinked.* void* CEEInfo::getPInvokeUnmanagedTarget(CORINFO_METHOD_HANDLE method, diff --git a/src/vm/jitinterface.h b/src/vm/jitinterface.h index d287248d2486..a585d440b826 100644 --- a/src/vm/jitinterface.h +++ b/src/vm/jitinterface.h @@ -777,11 +777,6 @@ class CEEInfo : public ICorJitInfo CORINFO_CLASS_HANDLE delegateCls, BOOL* pfIsOpenDelegate); - // Determines whether the delegate creation obeys security transparency rules - BOOL isDelegateCreationAllowed ( - CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd); - // ICorFieldInfo stuff const char* getFieldName (CORINFO_FIELD_HANDLE field, const char** scopeName); diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 60e03af5c2a9..d1064e38e1eb 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -3778,13 +3778,6 @@ BOOL ZapInfo::isCompatibleDelegate( return m_pEEJitInfo->isCompatibleDelegate(objCls, methodParentCls, method, delegateCls, pfIsOpenDelegate); } -BOOL ZapInfo::isDelegateCreationAllowed ( - CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd) -{ - return m_pEEJitInfo->isDelegateCreationAllowed(delegateHnd, calleeHnd); -} - // // ICorErrorInfo // diff --git a/src/zap/zapinfo.h b/src/zap/zapinfo.h index 6e83657170af..2f65a2cee76f 100644 --- a/src/zap/zapinfo.h +++ b/src/zap/zapinfo.h @@ -688,9 +688,6 @@ class ZapInfo CORINFO_CLASS_HANDLE delegateCls, BOOL* pfIsOpenDelegate); - BOOL isDelegateCreationAllowed(CORINFO_CLASS_HANDLE delegateHnd, - CORINFO_METHOD_HANDLE calleeHnd); - void getGSCookie(GSCookie * pCookieVal, GSCookie** ppCookieVal); // ICorErrorInfo