From a33d30b37732b172bd123e4ebc16d878d3cc19c0 Mon Sep 17 00:00:00 2001
From: Jeff Bezanson <jeff.bezanson@gmail.com>
Date: Sat, 25 Mar 2017 01:16:14 -0400
Subject: [PATCH] preserve identities of type wrappers in serializer. fixes
 #20324

---
 base/serialize.jl | 44 ++++++++++++++++++++++++++++++++++++++++++++
 test/serialize.jl | 13 +++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/base/serialize.jl b/base/serialize.jl
index 4210ff6130809d..df85a9659874bc 100644
--- a/base/serialize.jl
+++ b/base/serialize.jl
@@ -88,6 +88,7 @@ const TYPENAME_TAG = sertag(TypeName)
 const INT_TAG = sertag(Int)
 const GLOBALREF_TAG = sertag(GlobalRef)
 const BOTTOM_TAG = sertag(Bottom)
+const UNIONALL_TAG = sertag(UnionAll)
 
 writetag(s::IO, tag) = write(s, UInt8(tag))
 
@@ -518,6 +519,24 @@ end
 
 serialize(s::AbstractSerializer, ::Type{Bottom}) = write_as_tag(s.io, BOTTOM_TAG)
 
+function serialize(s::AbstractSerializer, u::UnionAll)
+    writetag(s.io, UNIONALL_TAG)
+    n = 0; t = u
+    while isa(t, UnionAll)
+        t = t.body
+        n += 1
+    end
+    if isa(t, DataType) && t === unwrap_unionall(t.name.wrapper)
+        write(s.io, UInt8(1))
+        write(s.io, Int16(n))
+        serialize(s, t)
+    else
+        write(s.io, UInt8(0))
+        serialize(s, u.var)
+        serialize(s, u.body)
+    end
+end
+
 serialize(s::AbstractSerializer, x::ANY) = serialize_any(s, x)
 
 function serialize_any(s::AbstractSerializer, x::ANY)
@@ -857,6 +876,31 @@ function deserialize_datatype(s::AbstractSerializer)
     deserialize(s, t)
 end
 
+function deserialize(s::AbstractSerializer, ::Type{UnionAll})
+    form = read(s.io, UInt8)
+    if form == 0
+        var = deserialize(s)
+        body = deserialize(s)
+        return UnionAll(var, body)
+    else
+        n = read(s.io, Int16)
+        t = deserialize(s)::DataType
+        w = t.name.wrapper
+        k = 0
+        while isa(w, UnionAll)
+            w = w.body
+            k += 1
+        end
+        w = t.name.wrapper
+        k -= n
+        while k > 0
+            w = w.body
+            k -= 1
+        end
+        return w
+    end
+end
+
 function deserialize(s::AbstractSerializer, ::Type{Task})
     t = Task(()->nothing)
     deserialize_cycle(s, t)
diff --git a/test/serialize.jl b/test/serialize.jl
index 76c19a7402d65a..63aac82a3f55ee 100644
--- a/test/serialize.jl
+++ b/test/serialize.jl
@@ -444,3 +444,16 @@ let a = ['T', 'e', 's', 't']
     seek(f,0)
     @test deserialize(f) === :β
 end
+
+# issue #20324
+struct T20324{T}
+    x::T
+end
+let x = T20324[T20324(1) for i = 1:2]
+    b = IOBuffer()
+    serialize(b, x)
+    seekstart(b)
+    y = deserialize(b)
+    @test isa(y,Vector{T20324})
+    @test y == x
+end