Remove ComputeSuppressUnmanagedCodeAccessAttr() and usage. (dotnet/coreclr#26409)

Commit migrated from https://github.com/dotnet/coreclr/commit/7f8014fc2ba126149a361c9de21e5f9ee1fca7cf

diff --git a/src/coreclr/src/vm/clrtocomcall.cpp b/src/coreclr/src/vm/clrtocomcall.cpp
index d111d1b9ed578a30235fa7240fb947cfa3920a52..eba7615ee6b5af2857f22c49b5fa3a498975c18e 100644 (file)
--- a/src/coreclr/src/vm/clrtocomcall.cpp
+++ b/src/coreclr/src/vm/clrtocomcall.cpp
@@ -146,8 +146,6 @@ ComPlusCallInfo *ComPlusCall::PopulateComPlusCallMethodDesc(MethodDesc* pMD, DWO
     if (pdwStubFlags == NULL)
         return pComInfo;
 
-    pMD->ComputeSuppressUnmanagedCodeAccessAttr(pMD->GetMDImport());
-
     //
     // Compute NDirectStubFlags
     //

diff --git a/src/coreclr/src/vm/method.cpp b/src/coreclr/src/vm/method.cpp
index 5de254e841d952f20e2329dad1a9cb14899ce3a7..fd0d13f138148b2ed8894dc51192fb74bfbb62ef 100644 (file)
--- a/src/coreclr/src/vm/method.cpp
+++ b/src/coreclr/src/vm/method.cpp
@@ -5324,19 +5324,6 @@ void NDirectMethodDesc::InitEarlyBoundNDirectTarget()
 }
 #endif // !CROSSGEN_COMPILE
 
-//*******************************************************************************
-void MethodDesc::ComputeSuppressUnmanagedCodeAccessAttr(IMDInternalImport *pImport)
-{
-    CONTRACTL
-    {
-        THROWS;
-        GC_NOTRIGGER;
-        FORBID_FAULT;
-    }
-    CONTRACTL_END;
-
-}
-
 //*******************************************************************************
 BOOL MethodDesc::HasNativeCallableAttribute()
 {

diff --git a/src/coreclr/src/vm/method.hpp b/src/coreclr/src/vm/method.hpp
index 6bbaea7728083508be2839faeb7636c9cc1bd890..596316befffb1fb480d87d0f6e0988bd05d99943 100644 (file)
--- a/src/coreclr/src/vm/method.hpp
+++ b/src/coreclr/src/vm/method.hpp
@@ -668,7 +668,6 @@ public:
         return GetMethodTable()->IsInterface();
     }
 
-    void ComputeSuppressUnmanagedCodeAccessAttr(IMDInternalImport *pImport);
     BOOL HasNativeCallableAttribute();
 
 #ifdef FEATURE_COMINTEROP 

diff --git a/src/coreclr/src/vm/methodtablebuilder.cpp b/src/coreclr/src/vm/methodtablebuilder.cpp
index d34f068fcbffb9833d21f36e6efba97ac7899ab2..a135ff5d681bb73e79f2119395c31aaf09e12584 100644 (file)
--- a/src/coreclr/src/vm/methodtablebuilder.cpp
+++ b/src/coreclr/src/vm/methodtablebuilder.cpp
@@ -6047,11 +6047,6 @@ MethodTableBuilder::InitMethodDesc(
     if (IsMdStatic(dwMemberAttrs))
         pNewMD->SetStatic();
 
-    // Set suppress unmanaged code access permission attribute
-
-    if (pNewMD->IsNDirect())
-        pNewMD->ComputeSuppressUnmanagedCodeAccessAttr(pIMDII);
-
 #ifdef _DEBUG 
     // Mark as many methods as synchronized as possible.
     //