Use id rather than var_id for labels

c42f · Jun 22, 2024 · c298c0f · c298c0f
1 parent 33e6c24
commit c298c0f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/ast.jl b/src/ast.jl
@@ -67,9 +67,10 @@ function makeleaf(ctx, srcref, k::Kind, value; kws...)
     graph = syntax_graph(ctx)
     if k == K"Identifier" || k == K"core" || k == K"top" || k == K"Symbol" || k == K"globalref"
         makeleaf(graph, srcref, k; name_val=value, kws...)
-    elseif k == K"SSAValue" || k == K"label"
-        # FIXME?
+    elseif k == K"SSAValue"
         makeleaf(graph, srcref, k; var_id=value, kws...)
+    elseif k == K"label"
+        makeleaf(graph, srcref, k; id=value, kws...)
     else
         val = k == K"Integer" ? convert(Int,     value) :
               k == K"Float"   ? convert(Float64, value) :

diff --git a/src/eval.jl b/src/eval.jl
@@ -224,9 +224,9 @@ function to_lowered_expr(mod, var_info, ex)
     elseif k == K"Value"
         ex.value
     elseif k == K"goto"
-        Core.GotoNode(ex[1].var_id)
+        Core.GotoNode(ex[1].id)
     elseif k == K"gotoifnot"
-        Core.GotoIfNot(to_lowered_expr(mod, var_info, ex[1]), ex[2].var_id)
+        Core.GotoIfNot(to_lowered_expr(mod, var_info, ex[1]), ex[2].id)
     else
         # Allowed forms according to https://docs.julialang.org/en/v1/devdocs/ast/
         #

diff --git a/src/linear_ir.jl b/src/linear_ir.jl
@@ -150,7 +150,7 @@ end
 function make_label(ctx, srcref)
     id = ctx.next_label_id[]
     ctx.next_label_id[] += 1
-    makeleaf(ctx, srcref, K"label", id)
+    makeleaf(ctx, srcref, K"label", id=id)
 end
 
 # flisp: make&mark-label
@@ -419,12 +419,12 @@ function _renumber(ctx, ssa_rewrites, slot_rewrites, label_table, ex)
         TODO(ex, "_renumber $k")
     elseif k == K"goto"
         @ast ctx ex [K"goto"
-            label_table[ex[1].var_id]::K"label"
+            label_table[ex[1].id]::K"label"
         ]
     elseif k == K"gotoifnot"
         @ast ctx ex [K"gotoifnot"
             _renumber(ctx, ssa_rewrites, slot_rewrites, label_table, ex[1])
-            label_table[ex[2].var_id]::K"label"
+            label_table[ex[2].id]::K"label"
         ]
     elseif k == K"lambda"
         ex
@@ -457,7 +457,7 @@ function renumber_body(ctx, input_code, slot_rewrites)
                 ex_out = ex[2]
             end
         elseif k == K"label"
-            label_table[ex.var_id] = length(code) + 1
+            label_table[ex.id] = length(code) + 1
         else
             ex_out = ex
         end
@@ -515,7 +515,8 @@ function linearize_ir(ctx, ex)
     graph = ensure_attributes(ctx.graph,
                               slot_rewrites=Dict{VarId,Int},
                               var_info=Dict{VarId,VarInfo},
-                              mod=Module)
+                              mod=Module,
+                              id=Int)
     # TODO: Cleanup needed - `_ctx` is just a dummy context here. But currently
     # required to call reparent() ...
     _ctx = LinearIRContext(graph, SyntaxList(graph), ctx.next_var_id,

diff --git a/src/syntax_graph.jl b/src/syntax_graph.jl
@@ -420,6 +420,9 @@ function _value_string(ex)
           k == K"slot"        ? "slot" :
           repr(get(ex, :value, nothing))
     id = get(ex, :var_id, nothing)
+    if isnothing(id)
+        id = get(ex, :id, nothing)
+    end
     if !isnothing(id)
         idstr = replace(string(id),
                         "0"=>"₀", "1"=>"₁", "2"=>"₂", "3"=>"₃", "4"=>"₄",