Merge pull request #490 from JuliaDebug/teh/testfail_promote_typeof

Don't splat in call to `append_any`

Author: pfitzseb

Project.toml

@@ -1,6 +1,6 @@
 name = "JuliaInterpreter"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.8.18"
+version = "0.8.19"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"

bin/generate_builtins.jl

@@ -146,14 +146,13 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
             print(io,
 """
     $head f === $fstr
-        argswrapped = getargs(args, frame)
+        args = getargs(args, frame)
         if !expand
-            return Some{Any}($fstr(argswrapped...))
+            return Some{Any}($fstr(args...))
         end
-        new_expr = Expr(:call, argswrapped[1])
-        popfirst!(argswrapped)
-        argsflat = append_any(argswrapped...)
-        for x in argsflat
+        new_expr = Expr(:call, args[1])
+        popfirst!(args)
+        for x in args
             push!(new_expr.args, (isa(x, Symbol) || isa(x, Expr) || isa(x, QuoteNode)) ? QuoteNode(x) : x)
         end
         return new_expr

src/builtins.jl

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

test/dummy_file.jl

@@ -0,0 +1,2 @@
+# Don't change the value below, it's used in an `include` test
+55

test/interpret.jl

@@ -811,3 +811,10 @@ end
     JuliaInterpreter.finish_and_return!(Frame(m, ex), true)
     @test isdefined(m, :foo)
 end
+
+# Related to fixing https://github.com/timholy/Revise.jl/issues/625
+module ForInclude end
+@testset "include" begin
+    ex = :(include("dummy_file.jl"))
+    @test JuliaInterpreter.finish_and_return!(Frame(ForInclude, ex), true) == 55
+end