Re-impose "no double lookup" for invoke

This was added in #442 and inadvertently removed in #532.
However, the test in #442 was not stringent enough; the test added here
comes from #535.

Fixes #535
Fixes timholy/Revise.jl#695

src/builtins.jl

@@ -191,11 +191,11 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
             return Some{Any}(getglobal(getargs(args, frame)...))
         end
     elseif f === invoke
-            argswrapped = getargs(args, frame)
             if !expand
+                argswrapped = getargs(args, frame)
                 return Some{Any}(invoke(argswrapped...))
             end
-            return Expr(:call, invoke, argswrapped...)
+            return Expr(:call, invoke, args[2:end]...)
     elseif f === isa
         if nargs == 2
             return Some{Any}(isa(@lookup(frame, args[2]), @lookup(frame, args[3])))

test/interpret.jl

@@ -727,9 +727,12 @@ end
     D = Diagonal([1.0, 2.0])
     @test @interpret(f(D)) === f(D)
 
-    # issue #441
+    # issue #441 & #535
     flog() = @info "logging macros"
-    @test @interpret flog() === nothing
+    @test_logs (:info, "logging macros") @test @interpret flog() === nothing
+    flog2() = @error "this error is ok"
+    frame = JuliaInterpreter.enter_call(flog2)
+    @test_logs (:error, "this error is ok") @test debug_command(frame, :c) === nothing
 end
 
 struct A396