Merge commit '279f82b97865a976a7e13b0bf2b62e0c8c92e45c'

Author: davidanthoff

packages/JuliaInterpreter/.github/workflows/CI.yml

@@ -41,7 +41,7 @@ jobs:
     env:
       PYTHON: ""
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}

packages/JuliaInterpreter/.github/workflows/Documenter.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           version: 'lts'
           show-versioninfo: true         # print versioninfo in the action log
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: julia-actions/julia-buildpkg@latest
       - uses: julia-actions/julia-docdeploy@latest
         env:

packages/JuliaInterpreter/.github/workflows/check_builtins.yml

@@ -10,7 +10,7 @@ jobs:
     name: 'Check builtins.jl consistency'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: julia-actions/setup-julia@v2
         with:
           version: nightly

packages/JuliaInterpreter/Project.toml

@@ -1,6 +1,6 @@
 name = "JuliaInterpreter"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.10.7"
+version = "0.10.9"
 authors = ["Tim Holy <[email protected]>, Kristoffer Carlsson <[email protected]>, Shuhei Kadowaki <[email protected]> and contributors"]
 
 [deps]
@@ -10,7 +10,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-CodeTracking = "2"
+CodeTracking = "2, 3"
 julia = "1.10"
 
 [extras]

packages/JuliaInterpreter/docs/Project.toml

@@ -9,3 +9,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 CodeTracking = "2"
 Documenter = "1"
+julia = "~1.10"

packages/JuliaInterpreter/docs/src/ast.md

@@ -82,7 +82,7 @@ branching into `@goto/@label` equivalents:
 
 This has very close correspondence to the lowered representation:
 
-```julia
+```julia-repl
 julia> code = @code_lowered debuginfo=:source summer(A)
 CodeInfo(
     @ REPL[1]:2 within `summer'
@@ -136,9 +136,9 @@ similar to how we named it in our alternative implementation above.)
 
 Let's look at a couple of the fields of the `CodeInfo`. First, the statements themselves:
 
-```julia
+```julia-repl
 julia> code.code
-16-element Array{Any,1}:
+16-element Vector{Any}:
  :(_3 = Main.zero($(Expr(:static_parameter, 1))))
  :(_2)
  :(_4 = Base.iterate(%2))
@@ -162,9 +162,9 @@ present in the statement list.
 The most noteworthy change here is the appearance of more objects like `_3`, which are
 references that index into local variable slots:
 
-```julia
+```julia-repl
 julia> code.slotnames
-5-element Array{Any,1}:
+5-element Vector{Any}:
  Symbol("#self#")
  :A
  :s

packages/JuliaInterpreter/docs/src/internals.md

@@ -7,7 +7,7 @@ evaluate these statements one-by-one, branching via the `goto` statements as app
 Using the `summer` example described in [Lowered representation](@ref),
 let's build a frame:
 
-```julia
+```julia-repl
 julia> frame = JuliaInterpreter.enter_call(summer, A)
 Frame for summer(A::AbstractArray{T,N} where N) where T in Main at REPL[2]:2
    1* 2  1 ─       s = (zero)($(Expr(:static_parameter, 1)))
@@ -26,9 +26,9 @@ in that it has been processed by [`JuliaInterpreter.optimize!`](@ref) to speed u
 `frame` has another field, `framedata`, that holds values needed for or generated by execution.
 The input arguments and local variables are in `locals`:
 
-```julia
+```julia-repl
 julia> frame.framedata.locals
-5-element Array{Union{Nothing, Some{Any}},1}:
+5-element Vector{Union{Nothing, Some{Any}}}:
  Some(summer)
  Some([1, 2, 5])
  nothing
@@ -41,19 +41,19 @@ is the input array. The remaining local variables (e.g., `s` and `a`), have not
 only built the frame, but we haven't yet begun to execute it.
 The static parameter, `T`, is stored in `frame.framedata.sparams`:
 
-```julia
+```julia-repl
 julia> frame.framedata.sparams
-1-element Array{Any,1}:
+1-element Vector{Any}:
  Int64
 ```
 
 The `Expr(:static_parameter, 1)` statement refers to this value.
 
 The other main storage is for the generated SSA values:
 
-```julia
+```julia-repl
 julia> frame.framedata.ssavalues
-16-element Array{Any,1}:
+16-element Vector{Any}:
  #undef
  #undef
  #undef
@@ -77,14 +77,14 @@ Since we haven't executed any statements yet, these are all undefined.
 The other main entity is the so-called [program counter](https://en.wikipedia.org/wiki/Program_counter),
 which just indicates the next statement to be executed:
 
-```julia
+```julia-repl
 julia> frame.pc
 1
 ```
 
 Let's try executing the first statement:
 
-```julia
+```julia-repl
 julia> JuliaInterpreter.step_expr!(frame)
 2
 ```
@@ -96,9 +96,9 @@ back to `frame`.)
 Since the first statement is an assignment of a local variable, let's check the
 locals again:
 
-```julia
+```julia-repl
 julia> frame.framedata.locals
-5-element Array{Union{Nothing, Some{Any}},1}:
+5-element Vector{Union{Nothing, Some{Any}}}:
  Some(summer)
  Some([1, 2, 5])
  Some(0)
@@ -111,12 +111,12 @@ You can see that the entry corresponding to `s` has been initialized.
 The next statement just retrieves one of the slots (the input argument `A`) and stores
 it in an SSA value:
 
-```julia
+```julia-repl
 julia> JuliaInterpreter.step_expr!(frame)
 3
 
 julia> frame.framedata.ssavalues
-16-element Array{Any,1}:
+16-element Vector{Any}:
  #undef
     [1, 2, 5]
  #undef
@@ -179,45 +179,23 @@ such expressions.
 
 Here's a demonstration of the problem:
 
-```julia
-ex = :(map(x->x^2, [1, 2, 3]))
-frame = Frame(Main, ex)
+```julia-repl
+julia> ex = :(map(x->x^2, [1, 2, 3]));
+
+julia> frame = Frame(Main, ex);
+
 julia> JuliaInterpreter.finish_and_return!(frame)
 ERROR: this frame needs to be run a top level
 ```
 
 The reason for this error becomes clearer if we examine `frame` or look directly at the lowered code:
 
-```julia
-julia> Meta.lower(Main, ex)
-:($(Expr(:thunk, CodeInfo(
-    @ none within `top-level scope`
-1 ─      $(Expr(:thunk, CodeInfo(
-    @ none within `top-level scope`
-1 ─      global var"#3#4"
-│        const var"#3#4"
-│   %3 = Core._structtype(Main, Symbol("#3#4"), Core.svec(), Core.svec(), Core.svec(), false, 0)
-│        var"#3#4" = %3
-│        Core._setsuper!(var"#3#4", Core.Function)
-│        Core._typebody!(var"#3#4", Core.svec())
-└──      return nothing
-)))
-│   %2 = Core.svec(var"#3#4", Core.Any)
-│   %3 = Core.svec()
-│   %4 = Core.svec(%2, %3, $(QuoteNode(:(#= REPL[18]:1 =#))))
-│        $(Expr(:method, false, :(%4), CodeInfo(
-    @ REPL[18]:1 within `none`
-1 ─ %1 = Core.apply_type(Base.Val, 2)
-│   %2 = (%1)()
-│   %3 = Base.literal_pow(^, x, %2)
-└──      return %3
-)))
-│        #3 = %new(var"#3#4")
-│   %7 = #3
-│   %8 = Base.vect(1, 2, 3)
-│   %9 = map(%7, %8)
-└──      return %9
-))))
+```@setup world-age-example
+ex = :(map(x->x^2, [1, 2, 3]))
+```
+
+```@repl world-age-example
+Meta.lower(Main, ex)
 ```
 
 All of the code before the `%7` line is devoted to defining the anonymous function `x->x^2`:
@@ -226,9 +204,9 @@ function" for this type, equivalent to `(var"#3#4")(x) = x^2`.
 
 In some cases one can fix this simply by indicating that we want to run this frame at top level:
 
-```julia
+```julia-repl
 julia> JuliaInterpreter.finish_and_return!(frame, true)
-3-element Array{Int64,1}:
+3-element Vector{Int64}:
  1
  4
  9

packages/JuliaInterpreter/src/construct.jl

@@ -362,7 +362,7 @@ Optionally supply an initial `LineNumberNode` `lnn`.
 
 In a fresh session,
 
-```
+```julia-repl
 julia> expr = quote
            public_fn(x::Integer) = true
            module Private
@@ -412,7 +412,7 @@ For evaluation by JuliaInterpreter, the returned module/expression pairs can be
 the `Frame` constructor. However, some expressions cannot be converted into `Frame`s and may need
 special handling:
 
-```julia
+```julia-repl
 julia> for (mod, ex) in ExprSplitter(Main, expr)
            if ex.head === :global
                # global declarations can't be lowered to a CodeInfo.

packages/JuliaInterpreter/src/optimize.jl

@@ -19,7 +19,9 @@ function lookup_stmt(stmts::Vector{Any}, @nospecialize arg)
         if isa(q, QuoteNode) && (qval = q.value; qval isa Symbol)
             mod = lookup_stmt(stmts, arg.args[2])
             if isa(mod, GlobalRef)
-                mod = @invokelatest getglobal(mod.mod, mod.name)
+                if @invokelatest isdefinedglobal(mod.mod, mod.name)
+                    mod = @invokelatest getglobal(mod.mod, mod.name)
+                end
             end
             if isa(mod, Module)
                 if @invokelatest isdefinedglobal(mod, qval)