diff options
| author | Jeremy Barton <jbarton@microsoft.com> | 2018-01-20 08:41:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 08:41:39 -0800 |
| commit | af6388558f6723bd04dde5399e66bbb9cbb27964 (patch) | |
| tree | fea822d929d31168269a0d2ad9ed4f7e7590731b /src | |
| parent | 216a2d93979db085de75afbb2a3e762f51d76000 (diff) | |
| parent | e8aef1994dc4bebc95b62c85f03fcc587f9a2510 (diff) | |
| download | coreclr-af6388558f6723bd04dde5399e66bbb9cbb27964.tar.gz coreclr-af6388558f6723bd04dde5399e66bbb9cbb27964.tar.bz2 coreclr-af6388558f6723bd04dde5399e66bbb9cbb27964.zip | |
Merge pull request #15936 from GrabYourPitchforks/levib/memory_nullref
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 7e89051d31..4df630f764 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 c09f01262e..5a8a6fcc21 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}"/> |