From 594fafcd7253d91d699d49f5573724ed4941e9ef Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Fri, 28 Apr 2017 14:41:30 -0400
Subject: [PATCH] add invokelatest from Julia 0.6 (#352)

* add invokelatest from Julia 0.6
---
 README.md        | 14 ++++++++++----
 src/Compat.jl    |  7 +++++++
 test/runtests.jl |  9 +++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0e1515fc8e7a0..1909c15ac6fd8 100644
--- a/README.md
+++ b/README.md
@@ -165,6 +165,10 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `bswap` is supported for `Complex` arguments on 0.5 and below. ([#21346])
 
+* `Compat.invokelatest` is equivalent to `Base.invokelatest` in Julia 0.6,
+  but works in Julia 0.4+, and allows you to guarantee that a function call
+  invokes the latest version of a function ([#19784]).
+
 * `Compat.StringVector` is supported on 0.5 and below. On 0.6 and later, it aliases `Base.StringVector`. This function allocates a `Vector{UInt8}` whose data can be made into a `String` in constant time; that is, without copying. On 0.5 and later, use `String(...)` with the vector allocated by `StringVector` as an argument to create a string without copying. Note that if 0.4 support is needed, `Compat.UTF8String(...)` should be used instead. ([#19449])
 
 ## Renamed functions
@@ -343,16 +347,19 @@ includes this fix. Find the minimum version from there.
 [#17323]: https://github.com/JuliaLang/julia/issues/17323
 [#17510]: https://github.com/JuliaLang/julia/issues/17510
 [#17623]: https://github.com/JuliaLang/julia/issues/17623
-[#18086]: https://github.com/JuliaLang/julia/issues/18086
+[#18082]: https://github.com/JuliaLang/julia/issues/18082
 [#18380]: https://github.com/JuliaLang/julia/issues/18380
 [#18484]: https://github.com/JuliaLang/julia/issues/18484
 [#18510]: https://github.com/JuliaLang/julia/issues/18510
+[#18629]: https://github.com/JuliaLang/julia/issues/18629
 [#18727]: https://github.com/JuliaLang/julia/issues/18727
 [#18839]: https://github.com/JuliaLang/julia/issues/18839
 [#18977]: https://github.com/JuliaLang/julia/issues/18977
 [#19088]: https://github.com/JuliaLang/julia/issues/19088
 [#19246]: https://github.com/JuliaLang/julia/issues/19246
+[#19449]: https://github.com/JuliaLang/julia/issues/19449
 [#19635]: https://github.com/JuliaLang/julia/issues/19635
+[#19784]: https://github.com/JuliaLang/julia/issues/19784
 [#19841]: https://github.com/JuliaLang/julia/issues/19841
 [#19950]: https://github.com/JuliaLang/julia/issues/19950
 [#20022]: https://github.com/JuliaLang/julia/issues/20022
@@ -363,6 +370,5 @@ includes this fix. Find the minimum version from there.
 [#20414]: https://github.com/JuliaLang/julia/issues/20414
 [#20418]: https://github.com/JuliaLang/julia/issues/20418
 [#20500]: https://github.com/JuliaLang/julia/issues/20500
-[#18629]: https://github.com/JuliaLang/julia/pull/18629
-[#21346]: https://github.com/JuliaLang/julia/pull/21346
-[#21257]: https://github.com/JuliaLang/julia/pull/21257
+[#21257]: https://github.com/JuliaLang/julia/issues/21257
+[#21346]: https://github.com/JuliaLang/julia/issues/21346
diff --git a/src/Compat.jl b/src/Compat.jl
index 224c27ab4d9b7..8679e7e08a027 100644
--- a/src/Compat.jl
+++ b/src/Compat.jl
@@ -1471,6 +1471,13 @@ else
     using Base: StringVector
 end
 
+# https://github.com/JuliaLang/julia/pull/19784
+if isdefined(Base, :invokelatest)
+    import Base.invokelatest
+else
+    invokelatest(f, args...) = eval(Expr(:call, f, map(QuoteNode, args)...))
+end
+
 # https://github.com/JuliaLang/julia/pull/21257
 if v"0.5.0-rc1+46" <= VERSION < v"0.6.0-pre.beta.28"
     collect(A) = collect_indices(indices(A), A)
diff --git a/test/runtests.jl b/test/runtests.jl
index 10b21be141576..991f61d142039 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1840,6 +1840,15 @@ if VERSION >= v"0.5.0-rc1+46"
     @test b == [1,2,3]
 end
 
+# invokelatest
+issue19774(x) = 1
+let foo() = begin
+        eval(:(issue19774(x::Int) = 2))
+        return Compat.invokelatest(issue19774, 0)
+    end
+    @test foo() == 2
+end
+
 include("to-be-deprecated.jl")
 
 nothing