fix lowering of closure supertypes #44974
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The supertype should be set earlier, to avoid assigning a global to a type object that's not fully initialized.
JeffBezanson
added
the
compiler:lowering
vtjnash
approved these changes
Apr 13, 2022
vtjnash
added
the
status:merge me
|
Is there some symptom this fixes? Any test? |
|
My understanding is that this is needed by JuliaInterpreter, since it operates on the type object while it's in an invalid state, and this reduces the window where that can happen. I don't think it's possible to see any change from this just using the normal system. |
DilumAluthge
removed
the
status:merge me
aviatesk
added a commit
to JuliaDebug/LoweredCodeUtils.jl
that referenced
this pull request
Apr 19, 2022
Lowering for a closure construct has been changed by JuliaLang/julia#44974 as like: ```julia julia> using LoweredCodeUtils, JuliaInterpreter julia> ex = quote function fouter(x) finner(::Float16) = 2x return finner(Float16(1)) end end quote #= REPL[19]:2 =# function fouter(x) #= REPL[19]:2 =# #= REPL[19]:3 =# finner(::Float16) = begin #= REPL[19]:3 =# 2x end #= REPL[19]:4 =# return finner(Float16(1)) end end julia> Core.eval(@__MODULE__, ex) fouter (generic function with 1 method) julia> Frame(@__MODULE__, ex).framecode.src ``` ```diff diff --git a/before.jl b/after.jl index 24b26cb..728d385 100644 --- a/before.jl +++ b/after.jl @@ -12,9 +12,9 @@ CodeInfo( │ const var"#finner#2" │ Core.TypeVar(:x, Core.Any) │ %4 = Core._structtype(Main, Symbol("#finner#2"), Core.svec(%3), Core.svec(:x), Core.svec(), false, 1) +│ Core._setsuper!(%4, Core.Function) │ var"#finner#2" = %4 -│ Core._setsuper!(var"#finner#2", Core.Function) -│ Core._typebody!(var"#finner#2", Core.svec(%3)) +│ Core._typebody!(%4, Core.svec(%3)) └── return nothing ))) │ ($(QuoteNode(Core.svec)))(var"#finner#2", Float16) ```
aviatesk
added a commit
to JuliaDebug/LoweredCodeUtils.jl
that referenced
this pull request
Apr 19, 2022
Lowering for a closure construct has been changed by JuliaLang/julia#44974 as like: ```julia julia> using LoweredCodeUtils, JuliaInterpreter julia> ex = quote function fouter(x) finner(::Float16) = 2x return finner(Float16(1)) end end quote #= REPL[19]:2 =# function fouter(x) #= REPL[19]:2 =# #= REPL[19]:3 =# finner(::Float16) = begin #= REPL[19]:3 =# 2x end #= REPL[19]:4 =# return finner(Float16(1)) end end julia> Core.eval(@__MODULE__, ex) fouter (generic function with 1 method) julia> Frame(@__MODULE__, ex).framecode.src ``` ```diff diff --git a/before.jl b/after.jl index 24b26cb..728d385 100644 --- a/before.jl +++ b/after.jl @@ -12,9 +12,9 @@ CodeInfo( │ const var"#finner#2" │ Core.TypeVar(:x, Core.Any) │ %4 = Core._structtype(Main, Symbol("#finner#2"), Core.svec(%3), Core.svec(:x), Core.svec(), false, 1) +│ Core._setsuper!(%4, Core.Function) │ var"#finner#2" = %4 -│ Core._setsuper!(var"#finner#2", Core.Function) -│ Core._typebody!(var"#finner#2", Core.svec(%3)) +│ Core._typebody!(%4, Core.svec(%3)) └── return nothing ))) │ ($(QuoteNode(Core.svec)))(var"#finner#2", Float16) ```
aviatesk
added a commit
to JuliaDebug/LoweredCodeUtils.jl
that referenced
this pull request
Apr 19, 2022
Lowering for a closure construct has been changed by JuliaLang/julia#44974 as like: ```julia julia> using LoweredCodeUtils, JuliaInterpreter julia> ex = quote function fouter(x) finner(::Float16) = 2x return finner(Float16(1)) end end quote #= REPL[19]:2 =# function fouter(x) #= REPL[19]:2 =# #= REPL[19]:3 =# finner(::Float16) = begin #= REPL[19]:3 =# 2x end #= REPL[19]:4 =# return finner(Float16(1)) end end julia> Core.eval(@__MODULE__, ex) fouter (generic function with 1 method) julia> Frame(@__MODULE__, ex).framecode.src ``` ```diff diff --git a/before.jl b/after.jl index 24b26cb..728d385 100644 --- a/before.jl +++ b/after.jl @@ -12,9 +12,9 @@ CodeInfo( │ const var"#finner#2" │ Core.TypeVar(:x, Core.Any) │ %4 = Core._structtype(Main, Symbol("#finner#2"), Core.svec(%3), Core.svec(:x), Core.svec(), false, 1) +│ Core._setsuper!(%4, Core.Function) │ var"#finner#2" = %4 -│ Core._setsuper!(var"#finner#2", Core.Function) -│ Core._typebody!(var"#finner#2", Core.svec(%3)) +│ Core._typebody!(%4, Core.svec(%3)) └── return nothing ))) │ ($(QuoteNode(Core.svec)))(var"#finner#2", Float16) ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The supertype should be set earlier, to avoid assigning a global to a type object that's not fully initialized.