fix #39705: lowering of Expr(:||) (#39709)

(cherry picked from commit 0858864)
JuliaLang · Jul 12, 2021 · 36169a9 · 36169a9
1 parent b6c224b
commit 36169a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -1927,7 +1927,10 @@
          (stmts (if blk? (cdr (butlast test)) '()))
          (test  (if blk? (last test) test)))
     (if (and (pair? test) (memq (car test) '(&& |\|\||)))
-        (let ((clauses `(,(car test) ,@(map expand-forms (cdr (flatten-ex (car test) test))))))
+        (let* ((clauses `(,(car test) ,@(map expand-forms (cdr (flatten-ex (car test) test)))))
+               (clauses (if (null? (cdr clauses))
+                            (if (eq? (car clauses) '&&) '(true) '(false))
+                            clauses)))
           `(if ,(if blk?
                     `(block ,@(map expand-forms stmts) ,clauses)
                     clauses)

diff --git a/test/cartesian.jl b/test/cartesian.jl
@@ -405,3 +405,7 @@ end
 
     @test @inferred(intersect(I, J)) == CartesianIndices((2:3, 4:5))
 end
+
+# issue #39705
+f39705() = Base.Cartesian.@nany 0 _ -> true
+@test f39705() === false
diff --git a/test/syntax.jl b/test/syntax.jl
@@ -2700,3 +2700,7 @@ end
 
 @test eval(Expr(:string, "a", Expr(:string, "b", "c"))) == "abc"
 @test eval(Expr(:string, "a", Expr(:string, "b", Expr(:string, "c")))) == "abc"
+
+# issue #39705
+@eval f39705(x) = $(Expr(:||)) && x
+@test f39705(1) === false