fix #15600, lowering bug in symbolic goto

JuliaLang · Mar 23, 2016 · 8e12e57 · 8e12e57
1 parent c29bff1
commit 8e12e57
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -3052,6 +3052,7 @@ f(x) = yt(x)
  (m (or m (let ((l (make-label)))
  (put! label-map (cadr e) l)
  l))))
+ (emit `(null)) ;; save space for `leave` that might be needed
  (emit `(goto ,m))
  (set! handler-goto-fixups
  (cons (list code handler-level (cadr e)) handler-goto-fixups))))

diff --git a/test/goto.jl b/test/goto.jl
@@ -101,3 +101,20 @@ end
 
 GotoMacroTest.@goto_test8_macro
 
+# issue #15600
+function t0_15600(flag)
+ flag && @goto return2
+ return 1
+ @label return2
+ return 2
+end
+@test t0_15600(true) == 2
+@test t0_15600(false) == 1
+function t1_15600(flag)
+ flag || @goto return2
+ return 1
+ @label return2
+ return 2
+end
+@test t1_15600(true) == 1
+@test t1_15600(false) == 2