Make CultureData properties static to allow illinker to more dead code (#38778)
authorMarek Safar <marek.safar@gmail.com>
Sat, 4 Jul 2020 22:32:56 +0000 (00:32 +0200)
committerGitHub <noreply@github.com>
Sat, 4 Jul 2020 22:32:56 +0000 (18:32 -0400)
src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Unix.cs
src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Windows.cs
src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.cs

index afda221..6b70511 100644 (file)
@@ -120,10 +120,10 @@ namespace System.Globalization
             return ebcdicCodePage == -1 ? CultureData.Invariant.EBCDICCodePage : ebcdicCodePage;
         }
 
-        internal bool IsWin32Installed => false;
+        internal static bool IsWin32Installed => false;
 
         internal static unsafe CultureData GetCurrentRegionData() => CultureInfo.CurrentCulture._cultureData;
 
-        private bool ShouldUseUserOverrideNlsData => false;
+        private static bool ShouldUseUserOverrideNlsData => false;
     }
 }
index d2eda6f..4511b55 100644 (file)
@@ -149,7 +149,7 @@ namespace System.Globalization
             _bUseOverrides = useUserOverride && _sWindowsName == CultureInfo.UserDefaultLocaleName;
         }
 
-        internal bool IsWin32Installed => true;
+        internal static bool IsWin32Installed => true;
 
         internal static unsafe CultureData GetCurrentRegionData()
         {
index e27639e..b63f5d9 100644 (file)
@@ -674,7 +674,7 @@ namespace System.Globalization
                     CultureTypes.NeutralCultures :
                     CultureTypes.SpecificCultures;
 
-                if (_cultureData.IsWin32Installed)
+                if (CultureData.IsWin32Installed)
                 {
                     types |= CultureTypes.InstalledWin32Cultures;
                 }