fix bug in lowering if with certain block exprs as the condition (J…

…uliaLang#38222)
halleysfifthinc · Oct 30, 2020 · 280b9ea · 280b9ea
1 parent 52ff1f0
commit 280b9ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -4082,7 +4082,7 @@ f(x) = yt(x)
  ((if elseif)
  (let ((tests (let* ((cond (cadr e))
  (cond (if (and (pair? cond) (eq? (car cond) 'block))
- (begin (compile (butlast cond) break-labels #f #f)
+ (begin (if (length> cond 2) (compile (butlast cond) break-labels #f #f))
  (last cond))
  cond)))
  (map (lambda (clause)

diff --git a/test/syntax.jl b/test/syntax.jl
@@ -2601,3 +2601,5 @@ end
  @test b === (y = 1, z = 3.0)
  end
 end
+
+@test eval(Expr(:if, Expr(:block, Expr(:&&, true, Expr(:call, :(===), 1, 1))), 1, 2)) == 1