Merge pull request #1043 from AArnott/v2.2

Merge master into v2.2
MessagePack-CSharp · Sep 14, 2020 · d997b6e · d997b6e
2 parents bf2ea7a + 71bdb0e
commit d997b6e
Show file tree

Hide file tree

Showing 14 changed files with 349 additions and 283 deletions.
diff --git a/README.md b/README.md
@@ -793,7 +793,7 @@ using (var ms = new MemoryStream())
 using (var ms = new MemoryStream())
 {
     // serialize empty array.
-    ProtoBuf.Serializer.Serialize<Parent>(ms, new Parent { Array = new int[0] });
+    ProtoBuf.Serializer.Serialize<Parent>(ms, new Parent { Array = System.Array.Empty<int>() });
 
     ms.Position = 0;
     var result = ProtoBuf.Serializer.Deserialize<Parent>(ms);

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/CollectionFormatter.cs
@@ -43,28 +43,30 @@ public T[] Deserialize(ref MessagePackReader reader, MessagePackSerializerOption
             {
                 return default;
             }
-            else
+
+            var len = reader.ReadArrayHeader();
+            if (len == 0)
             {
-                IMessagePackFormatter<T> formatter = options.Resolver.GetFormatterWithVerify<T>();
+                return Array.Empty<T>();
+            }
 
-                var len = reader.ReadArrayHeader();
-                var array = new T[len];
-                options.Security.DepthStep(ref reader);
-                try
-                {
-                    for (int i = 0; i < array.Length; i++)
-                    {
-                        reader.CancellationToken.ThrowIfCancellationRequested();
-                        array[i] = formatter.Deserialize(ref reader, options);
-                    }
-                }
-                finally
+            IMessagePackFormatter<T> formatter = options.Resolver.GetFormatterWithVerify<T>();
+            var array = new T[len];
+            options.Security.DepthStep(ref reader);
+            try
+            {
+                for (int i = 0; i < array.Length; i++)
                 {
-                    reader.Depth--;
+                    reader.CancellationToken.ThrowIfCancellationRequested();
+                    array[i] = formatter.Deserialize(ref reader, options);
                 }
-
-                return array;
             }
+            finally
+            {
+                reader.Depth--;
+            }
+
+            return array;
         }
     }
 
@@ -529,7 +531,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override Stack<T>.Enumerator GetSourceEnumerator(Stack<T> source)
@@ -585,7 +587,7 @@ protected override ReadOnlyCollection<T> Complete(T[] intermediateCollection)
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
     }
 
@@ -599,7 +601,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override IList<T> Complete(T[] intermediateCollection)
@@ -618,7 +620,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override ICollection<T> Complete(T[] intermediateCollection)
@@ -672,7 +674,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override IEnumerable<T> Complete(T[] intermediateCollection)
@@ -903,9 +905,13 @@ public IList Deserialize(ref MessagePackReader reader, MessagePackSerializerOpti
                 return default(IList);
             }
 
-            IMessagePackFormatter<object> formatter = options.Resolver.GetFormatterWithVerify<object>();
-
             var count = reader.ReadArrayHeader();
+            if (count == 0)
+            {
+                return Array.Empty<object>();
+            }
+
+            IMessagePackFormatter<object> formatter = options.Resolver.GetFormatterWithVerify<object>();
 
             var list = new object[count];
             options.Security.DepthStep(ref reader);
@@ -1079,7 +1085,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override IReadOnlyList<T> Complete(T[] intermediateCollection)
@@ -1097,7 +1103,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override IReadOnlyCollection<T> Complete(T[] intermediateCollection)
@@ -1175,7 +1181,7 @@ protected override void Add(T[] collection, int index, T value, MessagePackSeria
 
         protected override T[] Create(int count, MessagePackSerializerOptions options)
         {
-            return new T[count];
+            return count == 0 ? Array.Empty<T>() : new T[count];
         }
 
         protected override ConcurrentStack<T> Complete(T[] intermediateCollection)

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/DateTimeFormatters.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/DateTimeFormatters.cs
@@ -53,18 +53,21 @@ public DateTime[] Deserialize(ref MessagePackReader reader, MessagePackSerialize
             {
                 return null;
             }
-            else
+
+            var len = reader.ReadArrayHeader();
+            if (len == 0)
             {
-                var len = reader.ReadArrayHeader();
-                var array = new DateTime[len];
-                for (int i = 0; i < array.Length; i++)
-                {
-                    var dateData = reader.ReadInt64();
-                    array[i] = DateTime.FromBinary(dateData);
-                }
+                return Array.Empty<DateTime>();
+            }
 
-                return array;
+            var array = new DateTime[len];
+            for (int i = 0; i < array.Length; i++)
+            {
+                var dateData = reader.ReadInt64();
+                array[i] = DateTime.FromBinary(dateData);
             }
+
+            return array;
         }
     }
 }
diff --git a/...MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/PrimitiveObjectFormatter.cs b/...MessagePack.UnityClient/Assets/Scripts/MessagePack/Formatters/PrimitiveObjectFormatter.cs
@@ -282,6 +282,10 @@ public object Deserialize(ref MessagePackReader reader, MessagePackSerializerOpt
                 case MessagePackType.Array:
                     {
                         var length = reader.ReadArrayHeader();
+                        if (length == 0)
+                        {
+                            return Array.Empty<object>();
+                        }
 
                         IMessagePackFormatter<object> objectFormatter = resolver.GetFormatter<object>();
                         var array = new object[length];

diff --git a/...gePack.UnityClient/Assets/Scripts/MessagePack/Formatters/StandardClassLibraryFormatter.cs b/...gePack.UnityClient/Assets/Scripts/MessagePack/Formatters/StandardClassLibraryFormatter.cs
@@ -84,17 +84,20 @@ public String[] Deserialize(ref MessagePackReader reader, MessagePackSerializerO
             {
                 return null;
             }
-            else
+
+            var len = reader.ReadArrayHeader();
+            if (len == 0)
             {
-                var len = reader.ReadArrayHeader();
-                var array = new String[len];
-                for (int i = 0; i < array.Length; i++)
-                {
-                    array[i] = reader.ReadString();
-                }
+                return Array.Empty<String>();
+            }
 
-                return array;
+            var array = new String[len];
+            for (int i = 0; i < array.Length; i++)
+            {
+                array[i] = reader.ReadString();
             }
+
+            return array;
         }
     }
 

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Internal/AutomataDictionary.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Internal/AutomataDictionary.cs
@@ -142,9 +142,6 @@ public void EmitMatch(ILGenerator il, LocalBuilder bytesSpan, LocalBuilder key,
 
         private class AutomataNode : IComparable<AutomataNode>
         {
-            private static readonly AutomataNode[] EmptyNodes = new AutomataNode[0];
-            private static readonly ulong[] EmptyKeys = new ulong[0];
-
 #pragma warning disable SA1401 // Fields should be private
             internal ulong Key;
             internal int Value;
@@ -164,8 +161,8 @@ public AutomataNode(ulong key)
             {
                 this.Key = key;
                 this.Value = -1;
-                this.nexts = EmptyNodes;
-                this.nextKeys = EmptyKeys;
+                this.nexts = Array.Empty<AutomataNode>();
+                this.nextKeys = Array.Empty<ulong>();
                 this.count = 0;
                 this.OriginalKey = null;
             }

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MonoProtection.cs.meta b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MonoProtection.cs.meta
@@ -0,0 +1,10 @@
+guid: 593f3b742b875ea48943776d02f8d3a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: