Merge pull request #457 from simeonschaub/fixnightly

fix failures on nightly 2

Author: timholy

src/builtins.jl

@@ -63,7 +63,19 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
             push!(new_expr.args, (isa(x, Symbol) || isa(x, Expr) || isa(x, QuoteNode)) ? QuoteNode(x) : x)
         end
         return new_expr
-    elseif f === Core._apply_latest
+    elseif @static isdefined(Core, :_call_latest) ? f === Core._call_latest : false
+        argswrapped = getargs(args, frame)
+        if !expand
+            return Some{Any}(Core._call_latest(argswrapped...))
+        end
+        new_expr = Expr(:call, argswrapped[1])
+        popfirst!(argswrapped)
+        argsflat = append_any(argswrapped...)
+        for x in argsflat
+            push!(new_expr.args, (isa(x, Symbol) || isa(x, Expr) || isa(x, QuoteNode)) ? QuoteNode(x) : x)
+        end
+        return new_expr
+    elseif @static isdefined(Core, :_apply_latest) ? f === Core._apply_latest : false
         argswrapped = getargs(args, frame)
         if !expand
             return Some{Any}(Core._apply_latest(argswrapped...))

src/optimize.jl

@@ -249,7 +249,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

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)
+    @static 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

test/debug.jl

@@ -390,7 +390,7 @@ end
         @test get_return(frame) == f_inv(2)
     end
 
-    f_inv_latest(x::Real) = 1 + Core._apply_latest(f_inv, x)
+    f_inv_latest(x::Real) = 1 + (@static isdefined(Core, :_call_latest) ? Core._call_latest(f_inv, x) : Core._apply_latest(f_inv, x))
     @testset "invokelatest" begin
         fr = JuliaInterpreter.enter_call(f_inv_latest, 2.0)
         fr, pc = JuliaInterpreter.debug_command(fr, :nc)

test/interpret.jl

@@ -103,11 +103,23 @@ end
 @test @interpret(10.0^4) == 10.0^4
 # issue #6
 @test @interpret(Array.body.body.name) === Array.body.body.name
-@test @interpret(Vararg.body.body.name) === Vararg.body.body.name
+if Vararg isa UnionAll
+    @test @interpret(Vararg.body.body.name) === Vararg.body.body.name
+else
+    @test @interpret(Vararg{Int}.T) === Vararg{Int}.T
+    @test @interpret(Vararg{Any,3}.N) === Vararg{Any,3}.N
+end
 @test !JuliaInterpreter.is_vararg_type(Union{})
-frame = Frame(Main, :(Vararg.body.body.name))
-@test JuliaInterpreter.finish_and_return!(frame, true) === Vararg.body.body.name
-frame = Frame(Base, :(Union{AbstractChar,Tuple{Vararg{<:AbstractChar}},AbstractVector{<:AbstractChar},Set{<:AbstractChar}}))
+if Vararg isa UnionAll
+    frame = Frame(Main, :(Vararg.body.body.name))
+    @test JuliaInterpreter.finish_and_return!(frame, true) === Vararg.body.body.name
+else
+    frame = Frame(Main, :(Vararg{Int}.T))
+    @test JuliaInterpreter.finish_and_return!(frame, true) === Vararg{Int}.T
+    frame = Frame(Main, :(Vararg{Any,3}.N))
+    @test JuliaInterpreter.finish_and_return!(frame, true) === Vararg{Any,3}.N
+end
+frame = Frame(Base, :(Union{AbstractChar,Tuple{Vararg{AbstractChar}},AbstractVector{<:AbstractChar},Set{<:AbstractChar}}))
 @test JuliaInterpreter.finish_and_return!(frame, true) isa Union
 
 # issue #8
@@ -485,7 +497,7 @@ g_3(x) = error("foo")
 line_g = @__LINE__
 try
     break_on(:error)
-    frame, bp = @interpret g_1(2.0)
+    local frame, bp = @interpret g_1(2.0)
     stacktrace_lines = split(sprint(Base.display_error, bp.err, leaf(frame)), '\n')
     @test occursin(string("ERROR: ", sprint(showerror, ErrorException("foo"))), stacktrace_lines[1])
     if isdefined(Base, :print_stackframe)
@@ -513,7 +525,7 @@ try
             g_1(2.0)
         end))
     line2_g = @__LINE__
-    frame = Frame(exs[1]...)
+    local frame = Frame(exs[1]...)
     frame, bp = JuliaInterpreter.debug_command(frame, :c, true)
     stacktrace_lines = split(sprint(Base.display_error, bp.err, leaf(frame)), '\n')
     @test occursin(string("ERROR: ", sprint(showerror, ErrorException("foo"))), stacktrace_lines[1])

test/toplevel.jl

@@ -307,7 +307,7 @@ ex = quote
 end
 modexs = collect(ExprSplitter(IncTest, ex))
 for (i, (mod, ex)) in enumerate(modexs)
-    frame = Frame(mod, ex)
+    local frame = Frame(mod, ex)
     while true
         JuliaInterpreter.through_methoddef_or_done!(frame) === nothing && break
     end