Merge remote-tracking branch 'origin/main' into main

Cysharp · Nov 16, 2022 · 67f66bc · 67f66bc
2 parents 9ee151c + f5897bd
commit 67f66bc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/MemoryPack.Core/IMemoryPackFormatter.cs b/src/MemoryPack.Core/IMemoryPackFormatter.cs
@@ -47,14 +47,18 @@ public abstract void Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter
     [Preserve]
     void IMemoryPackFormatter.Serialize<TBufferWriter>(ref MemoryPackWriter<TBufferWriter> writer, scoped ref object? value)
     {
-        var v = (T?)value;
+        var v = (value == null)
+            ? default(T?)
+            : (T?)value;
         Serialize(ref writer, ref v);
     }
 
     [Preserve]
     void IMemoryPackFormatter.Deserialize(ref MemoryPackReader reader, scoped ref object? value)
     {
-        var v = (T?)value;
+        var v = (value == null)
+            ? default(T?)
+            : (T?)value;
         Deserialize(ref reader, ref v);
         value = v;
     }

diff --git a/...emoryPack.Unity/Assets/Plugins/MemoryPack/Runtime/MemoryPack.Core/IMemoryPackFormatter.cs b/...emoryPack.Unity/Assets/Plugins/MemoryPack/Runtime/MemoryPack.Core/IMemoryPackFormatter.cs
@@ -56,14 +56,18 @@ public abstract void Serialize(ref MemoryPackWriter writer, ref T? value)
     [Preserve]
     void IMemoryPackFormatter.Serialize(ref MemoryPackWriter writer, ref object? value)
     {
-        var v = (T?)value;
+        var v = (value == null)
+            ? default(T?)
+            : (T?)value;
         Serialize(ref writer, ref v);
     }
 
     [Preserve]
     void IMemoryPackFormatter.Deserialize(ref MemoryPackReader reader, ref object? value)
     {
-        var v = (T?)value;
+        var v = (value == null)
+            ? default(T?)
+            : (T?)value;
         Deserialize(ref reader, ref v);
         value = v;
     }

diff --git a/src/MemoryPack.Unity/Assets/Plugins/MemoryPack/package.json b/src/MemoryPack.Unity/Assets/Plugins/MemoryPack/package.json
@@ -2,7 +2,7 @@
     "name": "com.cysharp.memorypack",
     "displayName": "MemoryPack",
     "author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
-    "version": "1.7.3",
+    "version": "1.7.4",
     "unity": "2021.3",
     "description": "Zero encoding extreme performance binary serializer for C#.",
     "keywords": [ "Serialization" ],

diff --git a/tests/MemoryPack.Tests/PrimitiveTest.cs b/tests/MemoryPack.Tests/PrimitiveTest.cs
@@ -21,4 +21,15 @@ public void ArrayWriterInt()
         var i = MemoryPackSerializer.Deserialize<int>(buffer.WrittenSpan);
         i.Should().Be(123);
     }
+
+    [Fact]
+    public void NonGenericInt()
+    {
+        var bin = MemoryPackSerializer.Serialize(123);
+        var i = MemoryPackSerializer.Deserialize<int>(bin);
+        i.Should().Be(123);
+
+        var j = (int)MemoryPackSerializer.Deserialize(typeof(int), bin)!;
+        j.Should().Be(123);
+    }
 }