From 2a826df86a7aa6cf1e1bbb10e4f2e2df02d6e73c Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Sun, 22 Jan 2017 20:36:11 -0800
Subject: [PATCH] Remove FEATURE_LOADER_OPTIMIZATION

Commit migrated from https://github.com/dotnet/coreclr/commit/c1853ffc86372e239e77c5847b3079e005fda583
---
 src/coreclr/clr.coreclr.props                    | 1 -
 src/coreclr/clr.defines.targets                  | 2 --
 src/coreclr/clr.desktop.props                    | 1 -
 src/coreclr/clr.props                            | 1 -
 src/coreclr/src/mscorlib/src/System/AppDomain.cs | 8 --------
 5 files changed, 13 deletions(-)

diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props
index 47ba910..421b1b5 100644
--- a/src/coreclr/clr.coreclr.props
+++ b/src/coreclr/clr.coreclr.props
@@ -21,7 +21,6 @@
     <FeatureIsymReader>true</FeatureIsymReader>
     <!-- This is here for testing purposes only, and only on checked builds for x86/ARM -->
     <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages>
-    <FeatureLoaderOptimization>true</FeatureLoaderOptimization>
     <FeatureMainClrModuleUsesCoreName>true</FeatureMainClrModuleUsesCoreName>
     <FeatureMergeCultureSupportAndEngine>true</FeatureMergeCultureSupportAndEngine>
     <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
diff --git a/src/coreclr/clr.defines.targets b/src/coreclr/clr.defines.targets
index 2d39da9..8852490 100644
--- a/src/coreclr/clr.defines.targets
+++ b/src/coreclr/clr.defines.targets
@@ -47,7 +47,6 @@
         <CDefines Condition="'$(FeatureLazyCOWPages)' == 'true'">$(CDefines);FEATURE_LAZY_COW_PAGES</CDefines>
         <CDefines Condition="'$(FeatureLeakCultureInfo)' == 'true'">$(CDefines);FEATURE_LEAK_CULTURE_INFO</CDefines>
         <CDefines Condition="'$(FeatureLegacyNetCFDbgHostControl)' == 'true'">$(CDefines);FEATURE_LEGACYNETCF_DBG_HOST_CONTROL</CDefines> 
-        <CDefines Condition="'$(FeatureLoaderOptimization)' == 'true'">$(CDefines);FEATURE_LOADER_OPTIMIZATION</CDefines>
         <CDefines Condition="'$(FeatureMacl)' == 'true'">$(CDefines);FEATURE_MACL</CDefines>
         <CDefines Condition="'$(FeatureManagedEtw)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW</CDefines>
         <CDefines Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(CDefines);FEATURE_MANAGED_ETW_CHANNELS</CDefines>
@@ -150,7 +149,6 @@
         <DefineConstants Condition="'$(FeatureIsostore)' == 'true'">$(DefineConstants);FEATURE_ISOSTORE</DefineConstants>
         <DefineConstants Condition="'$(FeatureIsostoreLight)' == 'true'">$(DefineConstants);FEATURE_ISOSTORE_LIGHT</DefineConstants>
         <DefineConstants Condition="'$(FeatureLeakCultureInfo)' == 'true'">$(DefineConstants);FEATURE_LEAK_CULTURE_INFO</DefineConstants>
-        <DefineConstants Condition="'$(FeatureLoaderOptimization)' == 'true'">$(DefineConstants);FEATURE_LOADER_OPTIMIZATION</DefineConstants>
         <DefineConstants Condition="'$(FeatureMacl)' == 'true'">$(DefineConstants);FEATURE_MACL</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtw)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW</DefineConstants>
         <DefineConstants Condition="'$(FeatureManagedEtwChannels)' == 'true'">$(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS</DefineConstants>
diff --git a/src/coreclr/clr.desktop.props b/src/coreclr/clr.desktop.props
index fef8910..feb04dc 100644
--- a/src/coreclr/clr.desktop.props
+++ b/src/coreclr/clr.desktop.props
@@ -47,7 +47,6 @@
     <!-- This is here for testing purposes only, and only on checked builds for x86/ARM -->
     <FeatureLazyCOWPages Condition="'$(_BuildType)'!='ret' and (('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm'))">true</FeatureLazyCOWPages>
     <FeatureLeakCultureInfo>true</FeatureLeakCultureInfo>
-    <FeatureLoaderOptimization>true</FeatureLoaderOptimization>
     <FeatureMacl>true</FeatureMacl>
     <FeatureManagedEtw>true</FeatureManagedEtw>
     <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels>
diff --git a/src/coreclr/clr.props b/src/coreclr/clr.props
index 6e217e7..9c62dd6 100644
--- a/src/coreclr/clr.props
+++ b/src/coreclr/clr.props
@@ -133,7 +133,6 @@
     <FeatureEventTrace>false</FeatureEventTrace>
     <FeatureFusion>false</FeatureFusion>
     <FeatureIncludeAllInterfaces>false</FeatureIncludeAllInterfaces>
-    <FeatureLoaderOptimization>false</FeatureLoaderOptimization>
     <FeatureMdaSupported>false</FeatureMdaSupported>
     <FeatureMergeJitAndEngine>true</FeatureMergeJitAndEngine>
     <FeatureMulticoreJIT>false</FeatureMulticoreJIT>
diff --git a/src/coreclr/src/mscorlib/src/System/AppDomain.cs b/src/coreclr/src/mscorlib/src/System/AppDomain.cs
index c75353a..18aee26 100644
--- a/src/coreclr/src/mscorlib/src/System/AppDomain.cs
+++ b/src/coreclr/src/mscorlib/src/System/AppDomain.cs
@@ -941,11 +941,9 @@ namespace System
             int key = AppDomainSetup.Locate(name);
             if(key == -1) 
             {
-#if FEATURE_LOADER_OPTIMIZATION
                 if(name.Equals(AppDomainSetup.LoaderOptimizationKey))
                     return FusionStore.LoaderOptimization;
                 else 
-#endif // FEATURE_LOADER_OPTIMIZATION                    
                 {
                     object[] data;
                     lock (((ICollection)LocalStore).SyncRoot) {
@@ -1215,10 +1213,8 @@ namespace System
             nCreateContext();
 #endif // FEATURE_VERSIONING
 
-#if FEATURE_LOADER_OPTIMIZATION
             if (info.LoaderOptimization != LoaderOptimization.NotSpecified || (oldInfo != null && info.LoaderOptimization != oldInfo.LoaderOptimization))
                 UpdateLoaderOptimization(info.LoaderOptimization);
-#endif
             // This must be the last action taken
             _FusionStore = info;
         }
@@ -1353,7 +1349,6 @@ namespace System
 
                         newSetup.ApplicationBase = NormalizePath(propertyValues[i], fullCheck: true);
                     }
-#if FEATURE_LOADER_OPTIMIZATION
                     else if(propertyNames[i]=="LOADER_OPTIMIZATION")
                     {
                         if(propertyValues[i]==null)
@@ -1368,7 +1363,6 @@ namespace System
                             default: throw new ArgumentException(Environment.GetResourceString("Argument_UnrecognizedLoaderOptimization"), "LOADER_OPTIMIZATION");
                         }
                     }
-#endif // FEATURE_LOADER_OPTIMIZATION
                     else if(propertyNames[i]=="TRUSTED_PLATFORM_ASSEMBLIES" ||
                        propertyNames[i]=="PLATFORM_RESOURCE_ROOTS" ||
                        propertyNames[i]=="APP_PATHS" ||
@@ -1520,10 +1514,8 @@ namespace System
         private extern void nSetDisableInterfaceCache();
 #endif // FEATURE_COMINTEROP
 
-#if FEATURE_LOADER_OPTIMIZATION
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         internal extern void UpdateLoaderOptimization(LoaderOptimization optimization);
-#endif
 
         public AppDomainSetup SetupInformation
         {
-- 
2.7.4