diff options
| author | Levi Broderick <levib@microsoft.com> | 2018-01-19 11:50:02 -0800 |
|---|---|---|
| committer | Levi Broderick <levib@microsoft.com> | 2018-01-19 11:58:07 -0800 |
| commit | e8aef1994dc4bebc95b62c85f03fcc587f9a2510 (patch) | |
| tree | 86d1715fb641287c0e2b05964a93910be5e39a16 /src | |
| parent | f1c732878777092468ef8da8cd61aa8ec0922948 (diff) | |
| download | coreclr-e8aef1994dc4bebc95b62c85f03fcc587f9a2510.tar.gz coreclr-e8aef1994dc4bebc95b62c85f03fcc587f9a2510.tar.bz2 coreclr-e8aef1994dc4bebc95b62c85f03fcc587f9a2510.zip | |
Allow implicit conversion of null arrays to empty Memory instances
Diffstat (limited to 'src')
| -rw-r--r-- | src/mscorlib/shared/System/Memory.cs | 2 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/ReadOnlyMemory.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mscorlib/shared/System/Memory.cs b/src/mscorlib/shared/System/Memory.cs index 9cb6e385c1..c828e5d5ae 100644 --- a/src/mscorlib/shared/System/Memory.cs +++ b/src/mscorlib/shared/System/Memory.cs @@ -106,7 +106,7 @@ namespace System /// <summary> /// Defines an implicit conversion of an array to a <see cref="Memory{T}"/> /// </summary> - public static implicit operator Memory<T>(T[] array) => new Memory<T>(array); + public static implicit operator Memory<T>(T[] array) => (array != null) ? new Memory<T>(array) : default; /// <summary> /// Defines an implicit conversion of a <see cref="ArraySegment{T}"/> to a <see cref="Memory{T}"/> diff --git a/src/mscorlib/shared/System/ReadOnlyMemory.cs b/src/mscorlib/shared/System/ReadOnlyMemory.cs index d0f8a4790d..ba2f4dd542 100644 --- a/src/mscorlib/shared/System/ReadOnlyMemory.cs +++ b/src/mscorlib/shared/System/ReadOnlyMemory.cs @@ -97,7 +97,7 @@ namespace System /// <summary> /// Defines an implicit conversion of an array to a <see cref="ReadOnlyMemory{T}"/> /// </summary> - public static implicit operator ReadOnlyMemory<T>(T[] array) => new ReadOnlyMemory<T>(array); + public static implicit operator ReadOnlyMemory<T>(T[] array) => (array != null) ? new ReadOnlyMemory<T>(array) : default; /// <summary> /// Defines an implicit conversion of a <see cref="ArraySegment{T}"/> to a <see cref="ReadOnlyMemory{T}"/> |