Merge pull request #18119 from JuliaLang/jb/fix18085

fix #18085, segfault on method add in loop
JuliaLang · Aug 19, 2016 · e23cea1 · e23cea1 · nanosoldier · Aug 19, 2016
2 parents 57df5f1 + c9c7bfa
commit e23cea1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -2882,7 +2882,7 @@ f(x) = yt(x)
                         (let* ((exprs     (lift-toplevel (convert-lambda lam2 '|#anon| #t '())))
                                (top-stmts (cdr exprs))
                                (newlam    (renumber-slots-and-labels (linearize (car exprs)))))
-                          `(block
+                          `(toplevel-butlast
                             ,@top-stmts
                             ,@sp-inits
                             (method ,name ,(cl-convert sig fname lam namemap toplevel interp)

diff --git a/test/core.jl b/test/core.jl
@@ -4476,3 +4476,11 @@ function f18054()
     return Cint(0)
 end
 cfunction(f18054, Cint, ())
+
+# issue #18085
+f18085(a,x...) = (0,)
+for (f,g) in ((:asin,:sin), (:acos,:cos))
+    gx = eval(g)
+    f18085(::Type{Val{f}},x...) = map(x->2gx(x), f18085(Val{g},x...))
+end
+@test f18085(Val{:asin},3) === (0.0,)