From 9a6650acd087ad278465b91b9ff86a4c642fa89b Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Sat, 21 Nov 2020 23:19:28 +0000 Subject: [PATCH 1/2] Skip Invariant initalization test for CultureData.Invariant --- .../src/System/Globalization/TextInfo.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs index 06d9ac7e041882..8a4242b5c49d8f 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs @@ -37,7 +37,7 @@ private enum Tristate : byte private Tristate _isAsciiCasingSameAsInvariant = Tristate.NotInitialized; // Invariant text info - internal static readonly TextInfo Invariant = new TextInfo(CultureData.Invariant, readOnly: true); + internal static readonly TextInfo Invariant = new TextInfo(CultureData.Invariant, readOnly: true, isInvariant: true); internal TextInfo(CultureData cultureData) { @@ -52,9 +52,14 @@ internal TextInfo(CultureData cultureData) } } - private TextInfo(CultureData cultureData, bool readOnly) + private TextInfo(CultureData cultureData, bool readOnly, bool isInvariant = false) : this(cultureData) { + if (isInvariant) + { + _isAsciiCasingSameAsInvariant = Tristate.True; + } + SetReadOnlyState(readOnly); } From 00fdd254d3c4b33215d743f45e014454710e2091 Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Sun, 22 Nov 2020 02:46:37 +0000 Subject: [PATCH 2/2] Feedback --- .../src/System/Globalization/TextInfo.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs index 8a4242b5c49d8f..109ebde2c24dd4 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.cs @@ -37,7 +37,7 @@ private enum Tristate : byte private Tristate _isAsciiCasingSameAsInvariant = Tristate.NotInitialized; // Invariant text info - internal static readonly TextInfo Invariant = new TextInfo(CultureData.Invariant, readOnly: true, isInvariant: true); + internal static readonly TextInfo Invariant = new TextInfo(CultureData.Invariant, readOnly: true) { _isAsciiCasingSameAsInvariant = Tristate.True }; internal TextInfo(CultureData cultureData) { @@ -52,14 +52,9 @@ internal TextInfo(CultureData cultureData) } } - private TextInfo(CultureData cultureData, bool readOnly, bool isInvariant = false) + private TextInfo(CultureData cultureData, bool readOnly) : this(cultureData) { - if (isInvariant) - { - _isAsciiCasingSameAsInvariant = Tristate.True; - } - SetReadOnlyState(readOnly); }