Changes from code review

Co-authored-by: Claire Foster <[email protected]>

Author: mlechu

src/desugaring.jl

@@ -3814,7 +3814,7 @@ function insert_struct_shim(ctx, fieldtypes, name)
             ex[2].name_val == name.name_val
             @ast ctx ex [K"call" "struct_name_shim"::K"core" ex[1] ex[2] ctx.mod::K"Value" name]
         elseif numchildren(ex) > 0
-            @ast ctx ex [ex.kind map(replace_type, children(ex))...]
+            mapchildren(replace_type, ctx, ex)
         else
             ex
         end

src/linear_ir.jl

@@ -378,6 +378,11 @@ function emit_label(ctx, srcref)
     l
 end
 
+function emit_latestworld(ctx, srcref)
+    (isempty(ctx.code) || kind(last(ctx.code)) != K"latestworld") &&
+        emit(ctx, makeleaf(ctx, srcref, K"latestworld"))
+end
+
 function compile_condition_term(ctx, ex)
     cond = compile(ctx, ex, true, false)
     if !is_valid_body_ir_argument(ctx, cond)
@@ -831,7 +836,7 @@ function compile(ctx::LinearIRContext, ex, needs_value, in_tail_pos)
             throw(LoweringError(ex, "misplaced global declaration in value position"))
         end
         emit(ctx, ex)
-        ctx.is_toplevel_thunk && emit(ctx, makenode(ctx, ex, K"latestworld"))
+        ctx.is_toplevel_thunk && emit_latestworld(ctx, ex)
         nothing
     elseif k == K"meta"
         emit(ctx, ex)
@@ -888,11 +893,11 @@ function compile(ctx::LinearIRContext, ex, needs_value, in_tail_pos)
             rr = emit_assign_tmp(ctx, ex[2])
             emit(ctx, @ast ctx ex [K"globaldecl" ex[1] rr])
         end
-        ctx.is_toplevel_thunk && emit(ctx, makenode(ctx, ex, K"latestworld"))
+        ctx.is_toplevel_thunk && emit_latestworld(ctx, ex)
     elseif k == K"latestworld"
-        emit(ctx, ex)
+        emit_latestworld(ctx, ex)
     elseif k == K"latestworld_if_toplevel"
-        ctx.is_toplevel_thunk && emit(ctx, makeleaf(ctx, ex, K"latestworld"))
+        ctx.is_toplevel_thunk && emit_latestworld(ctx, ex)
     else
         throw(LoweringError(ex, "Invalid syntax; $(repr(k))"))
     end

test/closures_ir.jl

@@ -449,13 +449,12 @@ end
     2   (call %₁ slot₂/y 2)
     3   (return %₂)
 16  (latestworld)
-17  (latestworld)
-18  TestMod.#do##0
-19  (new %₁₈)
-20  (latestworld)
-21  TestMod.x
-22  (call core.kwcall %₅ %₁ %₁₉ %₂₁)
-23  (return %₂₂)
+17  TestMod.#do##0
+18  (new %₁₇)
+19  (latestworld)
+20  TestMod.x
+21  (call core.kwcall %₅ %₁ %₁₈ %₂₀)
+22  (return %₂₁)
 
 ########################################
 # Error: Static parameter clashing with closure name
@@ -701,13 +700,12 @@ end
 42  (call JuliaLowering.replace_captured_locals! %₃₉ %₄₁)
 43  --- method core.nothing %₃₈ %₄₂
 44  (latestworld)
-45  (latestworld)
-46  TestMod.#f_kw_closure##0
-47  (call core.svec %₄₆)
-48  (call core.svec)
-49  SourceLocation::2:14
-50  (call core.svec %₄₇ %₄₈ %₄₉)
-51  --- method core.nothing %₅₀
+45  TestMod.#f_kw_closure##0
+46  (call core.svec %₄₅)
+47  (call core.svec)
+48  SourceLocation::2:14
+49  (call core.svec %₄₆ %₄₇ %₄₈)
+50  --- method core.nothing %₄₉
     slots: [slot₁/#self# slot₂/#f_kw_closure#0(!read)]
     1   (call core.getfield slot₁/#self# :#f_kw_closure#0)
     2   (call core.isdefined %₁ :contents)
@@ -719,9 +717,9 @@ end
     8   TestMod.x_default
     9   (call %₇ %₈ slot₁/#self#)
     10  (return %₉)
-52  (latestworld)
-53  slot₃/f_kw_closure
-54  (return %₅₃)
+51  (latestworld)
+52  slot₃/f_kw_closure
+53  (return %₅₂)
 
 ########################################
 # Closure capturing a typed local must also capture the type expression

test/functions_ir.jl

@@ -17,13 +17,12 @@
     2   (call %₁ slot₂/x 1)
     3   (return %₂)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##0
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.xs
-17  (call top.Generator %₁₄ %₁₆)
-18  (return %₁₇)
+12  TestMod.#->##0
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.xs
+16  (call top.Generator %₁₃ %₁₅)
+17  (return %₁₆)
 
 ########################################
 # Product iteration
@@ -52,15 +51,14 @@
     10  (call %₇ %₈ %₉)
     11  (return %₁₀)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##1
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.xs
-17  TestMod.ys
-18  (call top.product %₁₆ %₁₇)
-19  (call top.Generator %₁₄ %₁₈)
-20  (return %₁₉)
+12  TestMod.#->##1
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.xs
+16  TestMod.ys
+17  (call top.product %₁₅ %₁₆)
+18  (call top.Generator %₁₃ %₁₇)
+19  (return %₁₈)
 
 ########################################
 # Use `identity` as the Generator function when possible eg in filters
@@ -88,14 +86,13 @@
     9   (call %₇ %₈)
     10  (return %₉)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##2
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.iter
-17  (call top.Filter %₁₄ %₁₆)
-18  (call top.Generator top.identity %₁₇)
-19  (return %₁₈)
+12  TestMod.#->##2
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.iter
+16  (call top.Filter %₁₃ %₁₅)
+17  (call top.Generator top.identity %₁₆)
+18  (return %₁₇)
 
 ########################################
 # Use of placeholders in iteration vars
@@ -114,13 +111,12 @@
     slots: [slot₁/#self#(!read) slot₂/_(!read)]
     1   (return 1)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##3
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.xs
-17  (call top.Generator %₁₄ %₁₆)
-18  (return %₁₇)
+12  TestMod.#->##3
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.xs
+16  (call top.Generator %₁₃ %₁₅)
+17  (return %₁₆)
 
 ########################################
 # Error: Use of placeholders in body
@@ -158,13 +154,12 @@ LoweringError:
     11  TestMod.body
     12  (return %₁₁)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##5
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.iter
-17  (call top.Generator %₁₄ %₁₆)
-18  (return %₁₇)
+12  TestMod.#->##5
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.iter
+16  (call top.Generator %₁₃ %₁₅)
+17  (return %₁₆)
 
 ########################################
 # return permitted in quoted syntax in generator
@@ -184,13 +179,12 @@ LoweringError:
     1   (call JuliaLowering.interpolate_ast (inert (return x)))
     2   (return %₁)
 11  (latestworld)
-12  (latestworld)
-13  TestMod.#->##6
-14  (new %₁₃)
-15  (latestworld)
-16  TestMod.iter
-17  (call top.Generator %₁₄ %₁₆)
-18  (return %₁₇)
+12  TestMod.#->##6
+13  (new %₁₂)
+14  (latestworld)
+15  TestMod.iter
+16  (call top.Generator %₁₃ %₁₅)
+17  (return %₁₆)
 
 ########################################
 # Error: `return` not permitted in generator body
@@ -238,15 +232,14 @@ LoweringError:
     5   (call top.Generator %₂ %₄)
     6   (return %₅)
 22  (latestworld)
-23  (latestworld)
-24  TestMod.#->##7
-25  (new %₂₄)
-26  (latestworld)
-27  TestMod.:
-28  (call %₂₇ 1 3)
-29  (call top.Generator %₂₅ %₂₈)
-30  (call top.Flatten %₂₉)
-31  (return %₃₀)
+23  TestMod.#->##7
+24  (new %₂₃)
+25  (latestworld)
+26  TestMod.:
+27  (call %₂₆ 1 3)
+28  (call top.Generator %₂₄ %₂₇)
+29  (call top.Flatten %₂₈)
+30  (return %₂₉)
 
 ########################################
 # Comprehension lowers to generator with collect