Remove ternary workaround for string.IsNullOrEmpty #63095
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,8 @@ | |
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Reflection; | ||
| using System.Runtime; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.Serialization; | ||
|
|
||
| using Internal.Runtime.CompilerServices; | ||
|
|
||
|
|
@@ -109,22 +109,19 @@ public override sealed int GetHashCode() | |
| } | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static bool operator ==(MulticastDelegate? d1, MulticastDelegate? d2) | ||
| { | ||
| // Test d2 first to allow branch elimination when inlined for null checks (== null) | ||
| // so it can become a simple test | ||
| if (d2 is null) | ||
| { | ||
| return d1 is null; | ||
| } | ||
|
|
||
| return ReferenceEquals(d2, d1) ? true : d2.Equals((object?)d1); | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static bool operator !=(MulticastDelegate? d1, MulticastDelegate? d2) | ||
| { | ||
|
|
@@ -134,8 +131,7 @@ public override sealed int GetHashCode() | |
| // so it can become a simple test | ||
| if (d2 is null) | ||
| { | ||
| return d1 is not null; | ||
| } | ||
|
|
||
| return ReferenceEquals(d2, d1) ? false : !d2.Equals(d1); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -556,45 +556,44 @@ private static void InsertionSort(Span<T> keys) | |
| // - The floating-point comparisons here assume no NaNs, which is valid only because the sorting routines | ||
| // themselves special-case NaN with a pre-pass that ensures none are present in the values being sorted | ||
| // by moving them all to the front first and then sorting the rest. | ||
| // - These are duplicated here rather than being on a helper type due to current limitations around generic inlining. | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] // compiles to a single comparison or method call | ||
| private static bool LessThan(ref T left, ref T right) | ||
| { | ||
| if (typeof(T) == typeof(byte)) return (byte)(object)left < (byte)(object)right; | ||
|
There was a problem hiding this comment. why these if’s and not using switch expressions for these in this file? There was a problem hiding this comment. The IL patterns of There was a problem hiding this comment. Also, |
||
| if (typeof(T) == typeof(sbyte)) return (sbyte)(object)left < (sbyte)(object)right; | ||
| if (typeof(T) == typeof(ushort)) return (ushort)(object)left < (ushort)(object)right; | ||
| if (typeof(T) == typeof(short)) return (short)(object)left < (short)(object)right; | ||
| if (typeof(T) == typeof(uint)) return (uint)(object)left < (uint)(object)right; | ||
| if (typeof(T) == typeof(int)) return (int)(object)left < (int)(object)right; | ||
| if (typeof(T) == typeof(ulong)) return (ulong)(object)left < (ulong)(object)right; | ||
| if (typeof(T) == typeof(long)) return (long)(object)left < (long)(object)right; | ||
| if (typeof(T) == typeof(nuint)) return (nuint)(object)left < (nuint)(object)right; | ||
| if (typeof(T) == typeof(nint)) return (nint)(object)left < (nint)(object)right; | ||
| if (typeof(T) == typeof(float)) return (float)(object)left < (float)(object)right; | ||
| if (typeof(T) == typeof(double)) return (double)(object)left < (double)(object)right; | ||
| if (typeof(T) == typeof(Half)) return (Half)(object)left < (Half)(object)right; | ||
| return left.CompareTo(right) < 0; | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] // compiles to a single comparison or method call | ||
| private static bool GreaterThan(ref T left, ref T right) | ||
| { | ||
| if (typeof(T) == typeof(byte)) return (byte)(object)left > (byte)(object)right; | ||
| if (typeof(T) == typeof(sbyte)) return (sbyte)(object)left > (sbyte)(object)right; | ||
| if (typeof(T) == typeof(ushort)) return (ushort)(object)left > (ushort)(object)right; | ||
| if (typeof(T) == typeof(short)) return (short)(object)left > (short)(object)right; | ||
| if (typeof(T) == typeof(uint)) return (uint)(object)left > (uint)(object)right; | ||
| if (typeof(T) == typeof(int)) return (int)(object)left > (int)(object)right; | ||
| if (typeof(T) == typeof(ulong)) return (ulong)(object)left > (ulong)(object)right; | ||
| if (typeof(T) == typeof(long)) return (long)(object)left > (long)(object)right; | ||
| if (typeof(T) == typeof(nuint)) return (nuint)(object)left > (nuint)(object)right; | ||
| if (typeof(T) == typeof(nint)) return (nint)(object)left > (nint)(object)right; | ||
| if (typeof(T) == typeof(float)) return (float)(object)left > (float)(object)right; | ||
| if (typeof(T) == typeof(double)) return (double)(object)left > (double)(object)right; | ||
| if (typeof(T) == typeof(Half)) return (Half)(object)left > (Half)(object)right; | ||
| return left.CompareTo(right) > 0; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1054,44 +1053,43 @@ private static void InsertionSort(Span<TKey> keys, Span<TValue> values) | |
| // - The floating-point comparisons here assume no NaNs, which is valid only because the sorting routines | ||
| // themselves special-case NaN with a pre-pass that ensures none are present in the values being sorted | ||
| // by moving them all to the front first and then sorting the rest. | ||
| // - These are duplicated here rather than being on a helper type due to current limitations around generic inlining. | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] // compiles to a single comparison or method call | ||
| private static bool LessThan(ref TKey left, ref TKey right) | ||
| { | ||
| if (typeof(TKey) == typeof(byte)) return (byte)(object)left < (byte)(object)right; | ||
| if (typeof(TKey) == typeof(sbyte)) return (sbyte)(object)left < (sbyte)(object)right; | ||
| if (typeof(TKey) == typeof(ushort)) return (ushort)(object)left < (ushort)(object)right; | ||
| if (typeof(TKey) == typeof(short)) return (short)(object)left < (short)(object)right; | ||
| if (typeof(TKey) == typeof(uint)) return (uint)(object)left < (uint)(object)right; | ||
| if (typeof(TKey) == typeof(int)) return (int)(object)left < (int)(object)right; | ||
| if (typeof(TKey) == typeof(ulong)) return (ulong)(object)left < (ulong)(object)right; | ||
| if (typeof(TKey) == typeof(long)) return (long)(object)left < (long)(object)right; | ||
| if (typeof(TKey) == typeof(nuint)) return (nuint)(object)left < (nuint)(object)right; | ||
| if (typeof(TKey) == typeof(nint)) return (nint)(object)left < (nint)(object)right; | ||
| if (typeof(TKey) == typeof(float)) return (float)(object)left < (float)(object)right; | ||
| if (typeof(TKey) == typeof(double)) return (double)(object)left < (double)(object)right; | ||
| if (typeof(TKey) == typeof(Half)) return (Half)(object)left < (Half)(object)right; | ||
| return left.CompareTo(right) < 0 ? true : false; | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] // compiles to a single comparison or method call | ||
| private static bool GreaterThan(ref TKey left, ref TKey right) | ||
| { | ||
| if (typeof(TKey) == typeof(byte)) return (byte)(object)left > (byte)(object)right; | ||
| if (typeof(TKey) == typeof(sbyte)) return (sbyte)(object)left > (sbyte)(object)right; | ||
| if (typeof(TKey) == typeof(ushort)) return (ushort)(object)left > (ushort)(object)right; | ||
| if (typeof(TKey) == typeof(short)) return (short)(object)left > (short)(object)right; | ||
| if (typeof(TKey) == typeof(uint)) return (uint)(object)left > (uint)(object)right; | ||
| if (typeof(TKey) == typeof(int)) return (int)(object)left > (int)(object)right; | ||
| if (typeof(TKey) == typeof(ulong)) return (ulong)(object)left > (ulong)(object)right; | ||
| if (typeof(TKey) == typeof(long)) return (long)(object)left > (long)(object)right; | ||
| if (typeof(TKey) == typeof(nuint)) return (nuint)(object)left > (nuint)(object)right; | ||
| if (typeof(TKey) == typeof(nint)) return (nint)(object)left > (nint)(object)right; | ||
| if (typeof(TKey) == typeof(float)) return (float)(object)left > (float)(object)right; | ||
| if (typeof(TKey) == typeof(double)) return (double)(object)left > (double)(object)right; | ||
| if (typeof(TKey) == typeof(Half)) return (Half)(object)left > (Half)(object)right; | ||
| return left.CompareTo(right) > 0 ? true : false; | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1085,8 +1085,7 @@ public static bool IsLeapYear(int year) | |
| } | ||
| if ((year & 3) != 0) return false; | ||
| if ((year & 15) == 0) return true; | ||
| return (uint)year % 25 != 0; | ||
| } | ||
|
|
||
| // Constructs a DateTime from a string. The string must specify a | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,31 +93,27 @@ public abstract partial class Delegate : ICloneable, ISerializable | |
| return newDelegate; | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static bool operator ==(Delegate? d1, Delegate? d2) | ||
| { | ||
| // Test d2 first to allow branch elimination when inlined for null checks (== null) | ||
| // so it can become a simple test | ||
| if (d2 is null) | ||
| { | ||
| return d1 is null; | ||
| } | ||
|
|
||
| return ReferenceEquals(d2, d1) ? true : d2.Equals((object?)d1); | ||
| } | ||
|
|
||
| [MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
| public static bool operator !=(Delegate? d1, Delegate? d2) | ||
| { | ||
| // Test d2 first to allow branch elimination when inlined for not null checks (!= null) | ||
| // so it can become a simple test | ||
| if (d2 is null) | ||
| { | ||
| return d1 is not null; | ||
| } | ||
|
|
||
| return ReferenceEquals(d2, d1) ? false : !d2.Equals(d1); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -164,9 +164,7 @@ internal static bool EqualsIgnoreCase(ref char charA, ref char charB, int length | |
| return false; // not exact match, and first input isn't in [A-Za-z] | ||
| } | ||
|
|
||
| return valueA == (valueB | 0x20u); | ||
| } | ||
|
|
||
| Debug.Assert(length == 0); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is quite a similar pattern to the one addressed by this PR. It's better to confirm there's no codegen regression separately.