From 0e61f5e74abf0f005ffec945b3de183833e8a060 Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Sat, 10 Sep 2016 10:36:40 -0400
Subject: [PATCH] Fix reflection macros for keyword calls

Fix #18434
---
 base/interactiveutil.jl |  9 ++++++---
 test/reflection.jl      | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/base/interactiveutil.jl b/base/interactiveutil.jl
index 97a1b67ea5f54..955aa20b33f10 100644
--- a/base/interactiveutil.jl
+++ b/base/interactiveutil.jl
@@ -347,9 +347,12 @@ function gen_call_with_extracted_types(fcn, ex0)
         if any(a->(Meta.isexpr(a, :kw) || Meta.isexpr(a, :parameters)), ex0.args)
             # remove keyword args, but call the kwfunc
             args = filter(a->!(Meta.isexpr(a, :kw) || Meta.isexpr(a, :parameters)), ex0.args)
-            return :($(fcn)(Core.kwfunc($(esc(args[1]))),
-                            Tuple{Vector{Any}, typeof($(esc(args[1]))),
-                                  $(typesof)($(map(esc, args[2:end])...)).parameters...}))
+            return quote
+                local arg1 = $(esc(args[1]))
+                $(fcn)(Core.kwfunc(arg1),
+                       Tuple{Vector{Any}, Core.Typeof(arg1),
+                             $(typesof)($(map(esc, args[2:end])...)).parameters...})
+            end
         elseif ex0.head == :call
             return Expr(:call, fcn, esc(ex0.args[1]),
                         Expr(:call, typesof, map(esc, ex0.args[2:end])...))
diff --git a/test/reflection.jl b/test/reflection.jl
index 35bd8ddc831c3..382fab91f3555 100644
--- a/test/reflection.jl
+++ b/test/reflection.jl
@@ -553,3 +553,18 @@ let
     @test length(a) == 0
     @test length(b) == 0
 end
+
+type A18434
+end
+(::Type{A18434})(x; y=1) = 1
+
+global counter18434 = 0
+function get_A18434()
+    global counter18434
+    counter18434 += 1
+    return A18434
+end
+@which get_A18434()(1; y=2)
+@test counter18434 == 1
+@which get_A18434()(1, y=2)
+@test counter18434 == 2