Skip to content

try fixing opaque_closure generation on 1.12 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisRackauckas merged 3 commits into from
Apr 22, 2025
Merged

try fixing opaque_closure generation on 1.12 #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
188f977
try fixing opaque_closure generation on 1.12
oscardssmith Apr 22, 2025
7c28f67
fix test
oscardssmith Apr 22, 2025
11763e5
fix
oscardssmith Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/RuntimeGeneratedFunctions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module RuntimeGeneratedFunctions

using ExprTools, Serialization, SHA
import Base.Experimental: @opaque

export RuntimeGeneratedFunction, @RuntimeGeneratedFunction, drop_expr

Expand Down Expand Up @@ -34,9 +35,7 @@ If `opaque_closures` is `true`, all closures in `function_expression` are
converted to
[opaque closures](https://github.com/JuliaLang/julia/pull/37849#issue-496641229).
This allows for the use of closures and generators inside the generated function,
but may not work in all cases due to slightly different semantics. This feature
requires Julia 1.7.

but may not work in all cases due to slightly different semantics.
# Examples
```
RuntimeGeneratedFunctions.init(@__MODULE__) # Required at module top-level
Expand All @@ -56,8 +55,7 @@ struct RuntimeGeneratedFunction{argnames, cache_tag, context_tag, id, B} <: Func
def = splitdef(ex)
args = normalize_args(get(def, :args, Symbol[]))
body = def[:body]
if opaque_closures && isdefined(Base, :Experimental) &&
isdefined(Base.Experimental, Symbol("@opaque"))
if opaque_closures
body = closures_to_opaque(body)
end
id = expr_to_id(body)
Expand Down Expand Up @@ -306,7 +304,8 @@ function closures_to_opaque(ex::Expr, return_type = nothing)
fdef[:body] = body
name = get(fdef, :name, nothing)
name !== nothing && delete!(fdef, :name)
_ex = Expr(:opaque_closure, combinedef(fdef))
opaque = Expr(:., Expr(:., :Base, QuoteNode(:Experimental)), QuoteNode(Symbol("@opaque")))
_ex = Expr(:macrocall, opaque, LineNumberNode(0), combinedef(fdef))
# TODO: emit named opaque closure for better stacktraces
# (ref https://github.com/JuliaLang/julia/pull/40242)
if name !== nothing
Expand Down
Loading