Merge pull request #2758 from stephentoub/list_toarray

Use _emptyArray in List<T>.ToArray

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mscorlib/src/System/Collections/Generic/List.cs b/src/mscorlib/src/System/Collections/Generic/List.cs
index 5a89c24328..869a15f0ce 100644
--- a/src/mscorlib/src/System/Collections/Generic/List.cs
+++ b/src/mscorlib/src/System/Collections/Generic/List.cs
@@ -1001,12 +1001,19 @@ namespace System.Collections.Generic {
             }
         }
 
-        // ToArray returns a new Object array containing the contents of the List.
+        // ToArray returns an array containing the contents of the List.
         // This requires copying the List, which is an O(n) operation.
         public T[] ToArray() {
             Contract.Ensures(Contract.Result<T[]>() != null);
             Contract.Ensures(Contract.Result<T[]>().Length == Count);
 
+#if FEATURE_CORECLR
+            if (_size == 0)
+            {
+                return _emptyArray;
+            }
+#endif
+
             T[] array = new T[_size];
             Array.Copy(_items, 0, array, 0, _size);
             return array;