summaryrefslogtreecommitdiff
path: root/src/vm/appdomain.cpp
diff options
context:
space:
mode:
authorSteve MacLean <stmaclea@microsoft.com>2018-12-22 01:28:33 -0500
committerJan Kotas <jkotas@microsoft.com>2018-12-21 22:28:33 -0800
commit0a1374f4f7c2141bf6d8ad74a68dd329afdbee78 (patch)
tree1762be883b2a3db896d05ac0823f33487082f82c /src/vm/appdomain.cpp
parenta6bd70554605b86f87a3a27ee95ef234ae5b919d (diff)
downloadcoreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.tar.gz
coreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.tar.bz2
coreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.zip
Remove dead ICLRPrivBinder methods (#21637)
* Remove dead FindAssemblyBySpec All paths returned E_FAIL * Remove dead BinderFlags * Remove dead VerifyBind
Diffstat (limited to 'src/vm/appdomain.cpp')
-rw-r--r--src/vm/appdomain.cpp30
1 files changed, 2 insertions, 28 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp
index 3e850f10d2..fe0c694462 100644
--- a/src/vm/appdomain.cpp
+++ b/src/vm/appdomain.cpp
@@ -5960,28 +5960,6 @@ private:
};
//-----------------------------------------------------------------------------------------------------------------
-static HRESULT VerifyBindHelper(
- ICLRPrivAssembly *pPrivAssembly,
- IAssemblyName *pAssemblyName,
- PEAssembly *pPEAssembly)
-{
- STATIC_CONTRACT_THROWS;
- STATIC_CONTRACT_GC_TRIGGERS;
-
- HRESULT hr = S_OK;
- // Create an ICLRPrivAssemblyInfo to call to ICLRPrivAssembly::VerifyBind
- NewHolder<PEAssemblyAsPrivAssemblyInfo> pPrivAssemblyInfoImpl = new PEAssemblyAsPrivAssemblyInfo(pPEAssembly);
- ReleaseHolder<ICLRPrivAssemblyInfo> pPrivAssemblyInfo;
- IfFailRet(pPrivAssemblyInfoImpl->QueryInterface(__uuidof(ICLRPrivAssemblyInfo), (LPVOID *)&pPrivAssemblyInfo));
- pPrivAssemblyInfoImpl.SuppressRelease();
-
- // Call VerifyBind to give the host a chance to reject the bind based on assembly image contents.
- IfFailRet(pPrivAssembly->VerifyBind(pAssemblyName, pPrivAssembly, pPrivAssemblyInfo));
-
- return hr;
-}
-
-//-----------------------------------------------------------------------------------------------------------------
HRESULT AppDomain::BindAssemblySpecForHostedBinder(
AssemblySpec * pSpec,
IAssemblyName * pAssemblyName,
@@ -6041,8 +6019,8 @@ AppDomain::BindHostedPrivAssembly(
}
if (*ppAssembly != nullptr)
- { // Already exists: ask the binder to verify and return the assembly.
- return VerifyBindHelper(pPrivAssembly, pAssemblyName, *ppAssembly);
+ { // Already exists: return the assembly.
+ return S_OK;
}
// Get the IL PEFile.
@@ -6080,10 +6058,6 @@ AppDomain::BindHostedPrivAssembly(
// Create a PEAssembly using the IL and NI images.
PEAssemblyHolder pPEAssembly = PEAssembly::Open(pParentAssembly, pPEImageIL, pPEImageNI, pPrivAssembly);
-
- // Ask the binder to verify.
- IfFailRet(VerifyBindHelper(pPrivAssembly, pAssemblyName, pPEAssembly));
-
// The result.
*ppAssembly = pPEAssembly.Extract();