inference: fix stupdate for Conditional after slot re-assignment #25602
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
JeffBezanson
added
bugfix
| @@ -28,11 +28,11 @@ end | |||
| # end | |||
| # ``` | |||
| mutable struct Conditional | |||
| var::Union{Slot,SSAValue} | |||
| var::Slot | |||
There was a problem hiding this comment.
Why can't this apply to SSAValues?
There was a problem hiding this comment.
Not worth the compile-time performance cost, since it'll never generate better results (on our current syntax).
Keno
reviewed
Jan 17, 2018
base/compiler/typelattice.jl
Outdated
| if isa(newtype, VarState) | ||
| newtypetyp = newtype.typ | ||
| if isa(newtypetyp, Conditional) && slot_id(newtypetyp.var) == changeid | ||
| newst[i] = VarState(Bool, newtype.undef) |
There was a problem hiding this comment.
Update to Const(...) if it's a conditional of the matching form?
Keno
approved these changes
Jan 17, 2018
test/compiler/compiler.jl
Outdated
| end | ||
| @test Base.return_types(h25579, (Base.RefValue{Union{Nothing, Int}},)) == | ||
| Any[Union{Type{Float64}, Type{Int64}, Type{Nothing}}] |
There was a problem hiding this comment.
Needs to be adjusted for 32-bit platforms. If I had a dime for every time I've done that...
We were neglecting to clear Conditional objects upon assignment to their attached slot (which invalidates their knowledge of the contents of that slot) fixes #25579
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.
We were neglecting to clear Conditional objects upon assignment to their attached slot
(which invalidates their knowledge of the contents of that slot)
fixes #25579