Adjust to upcoming Base Vararg change

simeonschaub · Dec 17, 2020 · 2b3b88b · 2b3b88b
1 parent fc3b614
commit 2b3b88b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/optimize.jl b/src/optimize.jl
@@ -243,7 +243,7 @@ function parametric_type_to_expr(t::Type)
     t isa Core.TypeofBottom && return t
     t isa UnionAll && (t = t.body)
     t = t::DataType
-    if t <: Vararg
+    if Base.isvarargtype(t)
         return Expr(:(...), t.parameters[1])
     end
     if t.hasfreetypevars

diff --git a/src/utils.jl b/src/utils.jl
@@ -248,12 +248,16 @@ end
 is_leaf(frame::Frame) = frame.callee === nothing
 
 function is_vararg_type(x)
-    if isa(x, Type)
-        (x <: Vararg && !(x <: Union{})) && return true
-        if isa(x, UnionAll)
-            x = Base.unwrap_unionall(x)
+    if isa(Vararg, Type)
+        if isa(x, Type)
+            (x <: Vararg && !(x <: Union{})) && return true
+            if isa(x, UnionAll)
+                x = Base.unwrap_unionall(x)
+            end
+            return isa(x, DataType) && nameof(x) == :Vararg
         end
-        return isa(x, DataType) && nameof(x) == :Vararg
+    else
+        return isa(x, typeof(Vararg))
     end
     return false
 end