invokelatest (from #352 and #359)

README.md

@@ -133,10 +133,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * The `isabstract`, `parameter_upper_bound`, `typename` reflection methods were added in Julia 0.6. This package re-exports these from the `Compat.TypeUtils` submodule. On earlier versions of julia, that module contains the same functions, but operating on the pre-0.6 type system representation.
 
-* `Compat.invokelatest` is equivalent to `Base.invokelatest` in Julia 0.6,
-  but works in Julia 0.5+, and allows you to guarantee that a function call
-  invokes the latest version of a function ([#19784]).
-
 * `Compat.invokelatest` supports keywords ([#22646]).
 
 * `@__MODULE__` is aliased to `current_module()` for Julia versions 0.6 and below. Versions of `Base.binding_module`, `expand`, `macroexpand`, and `include_string` were added that accept a module as the first argument. ([#22064])
@@ -454,7 +450,6 @@ includes this fix. Find the minimum version from there.
 [#13681]: https://github.com/JuliaLang/julia/issues/13681
 [#17302]: https://github.com/JuliaLang/julia/issues/17302
 [#17323]: https://github.com/JuliaLang/julia/issues/17323
-[#19784]: https://github.com/JuliaLang/julia/issues/19784
 [#20005]: https://github.com/JuliaLang/julia/issues/20005
 [#20974]: https://github.com/JuliaLang/julia/issues/20974
 [#21197]: https://github.com/JuliaLang/julia/issues/21197

src/Compat.jl

@@ -183,22 +183,14 @@ end
 # TODO deprecate/remove this unexported binding (along wiht its tests)
 using Base: StringVector
 
-# https://github.com/JuliaLang/julia/pull/19784
-@static if isdefined(Base, :invokelatest)
-    # https://github.com/JuliaLang/julia/pull/22646
-    if VERSION < v"0.7.0-DEV.1139"
-        function invokelatest(f, args...; kwargs...)
-            inner() = f(args...; kwargs...)
-            Base.invokelatest(inner)
-        end
-    else
-        import Base.invokelatest
-    end
-else
+# https://github.com/JuliaLang/julia/pull/22646
+if VERSION < v"0.7.0-DEV.1139"
     function invokelatest(f, args...; kwargs...)
-        kw = [Expr(:kw, k, QuoteNode(v)) for (k, v) in kwargs]
-        eval(current_module(), Expr(:call, f, map(QuoteNode, args)..., kw...))
+        inner() = f(args...; kwargs...)
+        Base.invokelatest(inner)
     end
+else
+    import Base.invokelatest
 end
 
 # https://github.com/JuliaLang/julia/pull/21197

test/runtests.jl

@@ -180,17 +180,7 @@ using Compat.Test
 @test (@__MODULE__) === Test22064
 end
 
-# invokelatest
-issue19774(x) = 1
-let foo() = begin
-        eval(:(issue19774(x::Int) = 2))
-        return Compat.invokelatest(issue19774, 0)
-    end
-    @test foo() == 2
-end
-cm359() = @__MODULE__
-@test Compat.invokelatest(cm359) === @__MODULE__
-
+# invokelatest with keywords
 pr22646(x; y=0) = 1
 let foo() = begin
         eval(:(pr22646(x::Int; y=0) = 2))