More tests, typo fix, delete an unused arg

Author: mlechu

src/desugaring.jl

@@ -2112,7 +2112,7 @@ end
 
 # Separate decls and assignments (which require re-expansion)
 # local x, (y=2), z ==> local x; local z; y = 2
-function expand_decls(ctx, ex, is_const=false)
+function expand_decls(ctx, ex)
     declkind = kind(ex)
     @assert declkind in KSet"local global"
     declmeta = get(ex, :meta, nothing)
@@ -2124,7 +2124,7 @@ function expand_decls(ctx, ex, is_const=false)
             @chk numchildren(binding) == 2
             lhs = strip_decls!(ctx, stmts, declkind, declmeta, binding[1])
             push!(stmts, expand_assignment(ctx, @ast ctx binding [kb lhs binding[2]]))
-        elseif is_sym_decl(binding) && !is_const
+        elseif is_sym_decl(binding)
             strip_decls!(ctx, stmts, declkind, declmeta, binding)
         else
             throw(LoweringError(ex, "invalid syntax in variable declaration"))
@@ -3085,7 +3085,7 @@ function expand_arrow_arglist(ctx, arglist, arrowname)
     if k == K"where"
         @ast ctx arglist [K"where"
             expand_arrow_arglist(ctx, arglist[1], arrowname)
-            argslist[2]
+            arglist[2]
         ]
     else
         # The arglist can sometimes be parsed as a block, or something else, and
@@ -3098,7 +3098,6 @@ function expand_arrow_arglist(ctx, arglist, arrowname)
                 [K"parameters" arglist[2]]
             ]
         elseif k != K"tuple"
-            # `x::Int -> body`
             arglist = @ast ctx arglist [K"tuple"
                 arglist[1]
             ]

src/eval.jl

@@ -84,7 +84,7 @@ function add_ir_debug_info!(current_codelocs_stack, stmt)
                                   current_codelocs_stack[j][1] != locstk[j][1])
             while length(current_codelocs_stack) >= j
                 info = pop!(current_codelocs_stack)
-                !isempty(current_codelocs_stack) && push!(last(current_codelocs_stack)[2], info)
+                push!(last(current_codelocs_stack)[2], info)
             end
         end
         if j > length(locstk)

test/branching.jl

@@ -221,6 +221,15 @@ end
 """) === 3
 
 end
+#-------------------------------------------------------------------------------
+# Block condition
+@test JuliaLowering.include_string(test_mod, """
+let a = true
+    if begin; x = 2; a; end
+        x
+    end
+end
+""") === 2
 
 #-------------------------------------------------------------------------------
 @testset "`&&` and `||` chains" begin

test/functions.jl

@@ -56,6 +56,31 @@ end
 2^4
 """) == 16
 
+#-------------------------------------------------------------------------------
+# Arrow syntax
+@test JuliaLowering.include_string(test_mod, """
+let
+    f = ((x::T, y::T) where T) -> x + y
+    f(1, 2)
+end
+""") === 3
+
+@test JuliaLowering.include_string(test_mod, """
+let
+    f = ((x::T; y=2) where T) -> x + y
+    f(1)
+end
+""") === 3
+
+# Passes desugaring, but T is detected as unused and throws an error.
+# Is it clear whether this should be `f(x::T) where T` or `f(x::T where T)`?
+@test_broken JuliaLowering.include_string(test_mod, """
+let
+    f = ((x::T) where T) -> x
+    f(1)
+end
+""") === 1
+
 #-------------------------------------------------------------------------------
 # Function definitions
 @test JuliaLowering.include_string(test_mod, """

test/typedefs_ir.jl

@@ -409,6 +409,52 @@ end
 34  latestworld
 35  (return core.nothing)
 
+########################################
+# Empty struct with empty ctor
+struct X
+    X() = new()
+end
+#---------------------
+1   (global TestMod.X)
+2   latestworld
+3   (call core.svec)
+4   (call core.svec)
+5   (call core.svec)
+6   (call core._structtype TestMod :X %₃ %₄ %₅ false 0)
+7   (= slot₁/X %₆)
+8   (call core._setsuper! %₆ core.Any)
+9   (call core.isdefinedglobal TestMod :X false)
+10  (gotoifnot %₉ label₁₄)
+11  TestMod.X
+12  (= slot₂/if_val (call core._equiv_typedef %₁₁ %₆))
+13  (goto label₁₅)
+14  (= slot₂/if_val false)
+15  slot₂/if_val
+16  (gotoifnot %₁₅ label₂₀)
+17  TestMod.X
+18  (= slot₃/if_val %₁₇)
+19  (goto label₂₁)
+20  (= slot₃/if_val false)
+21  slot₃/if_val
+22  (gotoifnot %₁₅ label₂₃)
+23  (call core.svec)
+24  (call core._typebody! %₂₁ %₆ %₂₃)
+25  (constdecl TestMod.X %₂₄)
+26  latestworld
+27  TestMod.X
+28  (call core.apply_type core.Type %₂₇)
+29  (call core.svec %₂₈)
+30  (call core.svec)
+31  SourceLocation::2:5
+32  (call core.svec %₂₉ %₃₀ %₃₁)
+33  --- method core.nothing %₃₂
+    slots: [slot₁/#ctor-self#]
+    1   slot₁/#ctor-self#
+    2   (new %₁)
+    3   (return %₂)
+34  latestworld
+35  (return core.nothing)
+
 ########################################
 # Basic struct
 struct X