From 0a1374f4f7c2141bf6d8ad74a68dd329afdbee78 Mon Sep 17 00:00:00 2001
From: Steve MacLean <stmaclea@microsoft.com>
Date: Sat, 22 Dec 2018 01:28:33 -0500
Subject: Remove dead ICLRPrivBinder methods (#21637)

* Remove dead FindAssemblyBySpec

All paths returned E_FAIL

* Remove dead BinderFlags

* Remove dead VerifyBind
---
 src/vm/appdomain.cpp | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'src/vm/appdomain.cpp')

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
@@ -5959,28 +5959,6 @@ private:
     ReleaseHolder<PEAssembly> m_pPEAssembly;
 };
 
-//-----------------------------------------------------------------------------------------------------------------
-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, 
@@ -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();
 
-- 
cgit v1.2.3