Merge pull request JuliaLang#21528 from JuliaLang/jb/fix21510

fix JuliaLang#21510, keyword arg with declared type `ANY`
TotalVerb · Apr 25, 2017 · 741971f · 741971f
2 parents 5cdff93 + 04e6010
commit 741971f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -506,9 +506,20 @@
                                                   (not (any (lambda (s)
                                                               (expr-contains-eq (car s) (caddr k)))
                                                             keyword-sparams)))
-                                             `(call (core typeassert)
-                                                    ,rval0
-                                                    ,(caddr k))
+                                             (let ((T (caddr k)))
+                                               `(call (core typeassert)
+                                                      ,rval0
+                                                      ;; work around `ANY` not being a type. if arg type
+                                                      ;; looks like `ANY`, test whether it is `ANY` at run
+                                                      ;; time and if so, substitute `Any`. issue #21510
+                                                      ,(if (or (eq? T 'ANY)
+                                                               (and (globalref? T)
+                                                                    (eq? (caddr T) 'ANY)))
+                                                           `(call (|.| (core Intrinsics) 'select_value)
+                                                                  (call (core ===) ,T (core ANY))
+                                                                  (core Any)
+                                                                  ,T)
+                                                           T)))
                                              rval0)))
                               ;; if kw[ii] == 'k; k = kw[ii+1]::Type; end
                               `(if (comparison ,elt === (quote ,(decl-var k)))

diff --git a/test/keywordargs.jl b/test/keywordargs.jl
@@ -270,3 +270,8 @@ function g21147(f::Tuple{A}, k = 2) where {B,A<:Tuple{B}}
 end
 @test g21147(((1,),)) === Int
 @test g21147(((1,),), 2) === Int
+
+# issue #21510
+f21510(; a::ANY = 2) = a
+@test f21510(a=:b) == :b
+@test f21510() == 2