fix nongenerics bug

Cysharp · Nov 15, 2022 · c2f36c3 · c2f36c3
1 parent f925dd0
commit c2f36c3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 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/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);
+    }
 }