Remove disabled FEATURE_PLS

Commit migrated from https://github.com/dotnet/coreclr/commit/5c89c2a3c7eaa0e02506a408d831fef2b7878601

diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets
index f381513..e2ef5b9 100644 (file)
--- a/src/coreclr/clr.defines.targets
+++ b/src/coreclr/clr.defines.targets
@@ -63,7 +63,6 @@
         <CDefines Condition="'$(FeatureNongenericCollections)' == 'true'">$(CDefines);FEATURE_NONGENERIC_COLLECTIONS</CDefines>
         <CDefines Condition="'$(FeaturePal)' == 'true'">$(CDefines);FEATURE_PAL</CDefines>
         <CDefines Condition="'$(FeaturePerfmon)' == 'true'">$(CDefines);FEATURE_PERFMON</CDefines>
-        <CDefines Condition="'$(FeaturePls)' == 'true'">$(CDefines);FEATURE_PLS</CDefines>
         <CDefines Condition="'$(FeaturePrejit)' == 'true'">$(CDefines);FEATURE_PREJIT</CDefines>
         <CDefines Condition="'$(FeatureRandomizedStringHashing)' == 'true'">$(CDefines);FEATURE_RANDOMIZED_STRING_HASHING</CDefines>
         <CDefines Condition="'$(FeatureReflectionOnlyLoad)' == 'true'">$(CDefines);FEATURE_REFLECTION_ONLY_LOAD</CDefines>
@@ -134,7 +133,6 @@
         <DefineConstants Condition="'$(FeaturePathCompat)' == 'true'">$(DefineConstants);FEATURE_PATHCOMPAT</DefineConstants>
         <DefineConstants Condition="'$(FeatureXplatEventSource)' == 'true'">$(DefineConstants);FEATURE_EVENTSOURCE_XPLAT</DefineConstants>
         <DefineConstants Condition="'$(FeaturePerfmon)' == 'true'">$(DefineConstants);FEATURE_PERFMON</DefineConstants>
-        <DefineConstants Condition="'$(FeaturePls)' == 'true'">$(DefineConstants);FEATURE_PLS</DefineConstants>
         <DefineConstants Condition="'$(FeatureRandomizedStringHashing)' == 'true'">$(DefineConstants);FEATURE_RANDOMIZED_STRING_HASHING</DefineConstants>
         <DefineConstants Condition="'$(FeatureReflectionOnlyLoad)' == 'true'">$(DefineConstants);FEATURE_REFLECTION_ONLY_LOAD</DefineConstants>
         <DefineConstants Condition="'$(FeatureRemoting)' == 'true'">$(DefineConstants);FEATURE_REMOTING</DefineConstants>

diff --git a/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props
index 47d0260..989f17d 100644 (file)
--- a/src/coreclr/clr.desktop.props
+++ b/src/coreclr/clr.desktop.props
@@ -49,7 +49,6 @@
     <FeatureNongenericCollections>true</FeatureNongenericCollections>
     <FeaturePathCompat>true</FeaturePathCompat>
     <FeaturePerfmon>true</FeaturePerfmon>
-    <FeaturePls>true</FeaturePls>
     <FeaturePrejit>true</FeaturePrejit>
     <FeatureRandomizedStringHashing>true</FeatureRandomizedStringHashing>
     <FeatureReflectionOnlyLoad>true</FeatureReflectionOnlyLoad>

diff --git a/src/coreclr/clr.props b/src/coreclr/clr.props
index 2380a41..880fe0b 100644 (file)
--- a/src/coreclr/clr.props
+++ b/src/coreclr/clr.props
@@ -139,7 +139,6 @@
     <FeatureReflectionOnlyLoad>false</FeatureReflectionOnlyLoad>
     <FeatureStackProbe>false</FeatureStackProbe>
     <FeatureReJIT>false</FeatureReJIT>
-    <FeaturePls>false</FeaturePls>
     <FeatureVersioningLog>false</FeatureVersioningLog>
     <FeatureNativeImageGeneration>true</FeatureNativeImageGeneration>
     <FeatureReadyToRunCompiler Condition="'$(FeatureReadyToRun)' == 'true'">true</FeatureReadyToRunCompiler>

diff --git a/src/coreclr/src/mscorlib/src/System/Security/CodeAccessSecurityEngine.cs b/src/coreclr/src/mscorlib/src/System/Security/CodeAccessSecurityEngine.cs
index 5324cef..cd4b5fd 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Security/CodeAccessSecurityEngine.cs
+++ b/src/coreclr/src/mscorlib/src/System/Security/CodeAccessSecurityEngine.cs
@@ -348,20 +348,5 @@ namespace System.Security {
         {
         }
 
-#if FEATURE_PLS
-        // Update the PLS used for optimization in the AppDomain: called from the VM
-        private static PermissionListSet UpdateAppDomainPLS(PermissionListSet adPLS, PermissionSet grantedPerms, PermissionSet refusedPerms) {
-            if (adPLS == null) {
-                adPLS = new PermissionListSet();
-                adPLS.UpdateDomainPLS(grantedPerms, refusedPerms);
-                return adPLS;
-            } else {
-                PermissionListSet newPLS = new PermissionListSet();
-                newPLS.UpdateDomainPLS(adPLS);
-                newPLS.UpdateDomainPLS(grantedPerms, refusedPerms);
-                return newPLS;
-            }
-        }
-#endif //FEATURE_PLS
     }
 }

diff --git a/src/coreclr/src/mscorlib/src/System/Security/PermissionListSet.cs b/src/coreclr/src/mscorlib/src/System/Security/PermissionListSet.cs
index d2990b4..75bb07c 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Security/PermissionListSet.cs
+++ b/src/coreclr/src/mscorlib/src/System/Security/PermissionListSet.cs
@@ -49,22 +49,6 @@ namespace System.Security
             }
         }
 
-#if FEATURE_PLS
-        internal void UpdateDomainPLS (PermissionListSet adPLS) {
-            if (adPLS != null && adPLS.m_firstPermSetTriple != null)
-                UpdateDomainPLS(adPLS.m_firstPermSetTriple.GrantSet, adPLS.m_firstPermSetTriple.RefusedSet);
-        }
-
-        internal void UpdateDomainPLS (PermissionSet grantSet, PermissionSet deniedSet) {
-            Debug.Assert(m_permSetTriples == null, "m_permSetTriples != null");
-            if (m_firstPermSetTriple == null)
-                m_firstPermSetTriple = new PermissionSetTriple();
-
-            // update the grant and denied sets
-            m_firstPermSetTriple.UpdateGrant(grantSet);
-            m_firstPermSetTriple.UpdateRefused(deniedSet);
-        }
-#endif // FEATURE_PLS
 
         private void Terminate(PermissionSetTriple currentTriple)
         {