Don't use trick for collapsed epilogs

Cf. #67049 (comment)
dotnet · Jul 20, 2022 · 30889ac · 30889ac
1 parent 4e99ac4
commit 30889ac
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs b/src/libraries/System.Private.CoreLib/src/System/String.Manipulation.cs
@@ -986,11 +986,13 @@ private string ReplaceCore(string oldValue, string? newValue, CompareInfo? ci, C
         //
         public string Replace(char oldChar, char newChar)
         {
-            int firstIndex;
-            if (oldChar == newChar || (firstIndex = IndexOf(oldChar)) < 0)
-            {
+            if (oldChar == newChar)
+                return this;
+
+            int firstIndex = IndexOf(oldChar);
+
+            if (firstIndex < 0)
                 return this;
-            }
 
             int remainingLength = Length - firstIndex;
             string result = FastAllocateString(Length);