From 339694220684c079698bb0e3656011b9522d26f3 Mon Sep 17 00:00:00 2001
From: Steve MacLean <stmaclea@microsoft.com>
Date: Wed, 5 Dec 2018 13:03:56 -0500
Subject: Remove FromGAC & OnTPAList (#21371)

* Remove FromGAC & OnTPAList
* PR feedback
---
 src/vm/pefile.cpp | 58 +++----------------------------------------------------
 1 file changed, 3 insertions(+), 55 deletions(-)

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

diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp
index d485e19364..fa5b1d4f1c 100644
--- a/src/vm/pefile.cpp
+++ b/src/vm/pefile.cpp
@@ -1927,10 +1927,7 @@ PEAssembly::PEAssembly(
   : PEFile(pBindResultInfo ? (pBindResultInfo->GetPEImage() ? pBindResultInfo->GetPEImage() : 
                                                               (pBindResultInfo->HasNativeImage() ? pBindResultInfo->GetNativeImage() : NULL)
                               ): pPEImageIL? pPEImageIL:(pPEImageNI? pPEImageNI:NULL), FALSE),
-    m_creator(clr::SafeAddRef(creator)),
-    m_bIsFromGAC(FALSE),
-    m_bIsOnTpaList(FALSE)
-    ,m_fProfileAssembly(0)
+    m_creator(clr::SafeAddRef(creator))
 {
     CONTRACTL
     {
@@ -1962,14 +1959,6 @@ PEAssembly::PEAssembly(
     if (!HasNativeImage() || !IsILOnly())
         EnsureImageOpened();
 
-    // Initialize the status of the assembly being in the GAC, or being part of the TPA list, before
-    // we start to do work (like strong name verification) that relies on those states to be valid.
-    if(pBindResultInfo != nullptr)
-    {
-        m_bIsFromGAC = pBindResultInfo->IsFromGAC();
-        m_bIsOnTpaList = pBindResultInfo->IsOnTpaList();
-    }
-
     // Open metadata eagerly to minimize failure windows
     if (pEmit == NULL)
         OpenMDImport_Unsafe(); //constructor, cannot race with anything
@@ -2130,7 +2119,7 @@ PEAssembly *PEAssembly::DoOpenSystem(IUnknown * pAppCtx)
     IfFailThrow(CCoreCLRBinderHelper::BindToSystem(&pPrivAsm, !IsCompilationProcess() || g_fAllowNativeImages));
     if(pPrivAsm != NULL)
     {
-        bindResult.Init(pPrivAsm, TRUE, TRUE);
+        bindResult.Init(pPrivAsm);
     }
 
     RETURN new PEAssembly(&bindResult, NULL, NULL, TRUE, FALSE);
@@ -2217,7 +2206,7 @@ PEAssembly *PEAssembly::DoOpenMemory(
     CoreBindResult bindResult;
     ReleaseHolder<ICLRPrivAssembly> assembly;
     IfFailThrow(CCoreCLRBinderHelper::GetAssemblyFromImage(image, NULL, &assembly));
-    bindResult.Init(assembly,FALSE,FALSE);
+    bindResult.Init(assembly);
 
     RETURN new PEAssembly(&bindResult, NULL, pParentAssembly, FALSE);
 }
@@ -2300,53 +2289,12 @@ void PEAssembly::SetNativeImage(PEImage * image)
 
 #endif  // FEATURE_PREJIT
 
-
-BOOL PEAssembly::IsSourceGAC()
-{
-    WRAPPER_NO_CONTRACT;
-    return m_bIsFromGAC;
-};
-
-
 #endif // #ifndef DACCESS_COMPILE
 
 
 
 #ifndef DACCESS_COMPILE
 
-BOOL PEAssembly::IsProfileAssembly()
-{
-    CONTRACTL
-    {
-        THROWS;
-        GC_TRIGGERS;
-        MODE_ANY;
-    }
-    CONTRACTL_END;
-
-    //
-    // For now, cache the result of the check below. This cache should be removed once/if the check below 
-    // becomes cheap (e.g. does not access metadata anymore).
-    //
-    if (VolatileLoadWithoutBarrier(&m_fProfileAssembly) != 0)
-    {
-        return m_fProfileAssembly > 0;
-    }
-
-    //
-    // In order to be a platform (profile) assembly, you must be from a trusted location (TPA list)
-    // If we are binding by TPA list and this assembly is on it, IsSourceGAC is true => Assembly is Profile
-    // If the assembly is a WinMD, it is automatically trusted since all WinMD scenarios are full trust scenarios.
-    //
-    // The check for Silverlight strongname platform assemblies is legacy backdoor. It was introduced by accidental abstraction leak
-    // from the old Silverlight binder, people took advantage of it and we cannot easily get rid of it now. See DevDiv #710462.
-    //
-    BOOL bProfileAssembly = IsSourceGAC() && (IsSystem() || m_bIsOnTpaList);
-
-    m_fProfileAssembly = bProfileAssembly ? 1 : -1;
-    return bProfileAssembly;
-}
-
 // ------------------------------------------------------------
 // Descriptive strings
 // ------------------------------------------------------------
-- 
cgit v1.2.3