inference: handle Vararg in abstract_call_unionall for argtypes computed by abstract_apply
#51393
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
Keno
reviewed
Sep 19, 2023
| @@ -1858,7 +1858,7 @@ function abstract_call_unionall(interp::AbstractInterpreter, argtypes::Vector{An | |||
| a2 = argtypes[2] | |||
| a3 = argtypes[3] | |||
| ⊑ᵢ = ⊑(typeinf_lattice(interp)) | |||
| nothrow = a2 ⊑ᵢ TypeVar && (a3 ⊑ᵢ Type || a3 ⊑ᵢ TypeVar) | |||
| nothrow = (!isvarargtype(a2) && a2 ⊑ᵢ TypeVar) && (!isvarargtype(a3) && (a3 ⊑ᵢ Type || a3 ⊑ᵢ TypeVar)) | |||
There was a problem hiding this comment.
a2 can't be vararg, since it's not the last argtype. If it's vararg, we can never prove nothrow, but maybe still unwrap a3 afterwards in case we can say something about the type?
There was a problem hiding this comment.
Ah right, abstract_apply truncates the first Vararg to ensure that Vararg only appears at the last argument:
julia/base/compiler/abstractinterpretation.jl
Lines 1580 to 1592 in 7f37e70
aviatesk
force-pushed
the
avi/fix-51310
branch
from
148334d
to
c9734e4
Compare
|
fix #51310 |
Keno
approved these changes
Sep 19, 2023
vtjnash
reviewed
Sep 19, 2023
| @@ -1858,7 +1858,12 @@ function abstract_call_unionall(interp::AbstractInterpreter, argtypes::Vector{An | |||
| a2 = argtypes[2] | |||
| a3 = argtypes[3] | |||
| ⊑ᵢ = ⊑(typeinf_lattice(interp)) | |||
| nothrow = a2 ⊑ᵢ TypeVar && (a3 ⊑ᵢ Type || a3 ⊑ᵢ TypeVar) | |||
| if isvarargtype(a3) | |||
There was a problem hiding this comment.
The length(argtypes) check is not correct either if you have varargs
There was a problem hiding this comment.
Yeah, but what we are trying to model here is call to the UnionAll(tv, t) method, which just throws MethodError when length(argtypes) ≠ 3 at runtime. So this is fine as far as we model nothrow correctly.
There was a problem hiding this comment.
When you have Vararg, you don’t know if length!=3, so you don’t know that if it throws an error or not
There was a problem hiding this comment.
Yes, we can't concluded that the rt is Bottom if either of the first two argtypes is Vararg, we should fix that.
There was a problem hiding this comment.
Ah, right... I will work on it.
aviatesk
added a commit
that referenced
this pull request
Sep 20, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 20, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 20, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 20, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 21, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 21, 2023
aviatesk
added a commit
that referenced
this pull request
Sep 26, 2023
… computed by `abstract_apply` (#51393) This commit adds special handling for `Vararg` types that may appear at the end of `argtypes`, as computed by `abstract_apply`. Even though PR within the abstract state, they can still be part of `argtypes`. As a result, this kind of special handling is still necessary. It remains an open question whether we can refactor `abstract_apply` to prevent `Vararg`s from appearing in `argtypes` in the first place.
58 tasks
KristofferC
added a commit
that referenced
this pull request
Oct 2, 2023
Backported PRs: - [x] #48625 <!-- add replace(io, str, patterns...) --> - [x] #48387 <!-- Improve documentation of sort-related functions --> - [x] #48363 <!-- Revise sort.md and docstrings in sort.jl --> - [x] #48977 <!-- Update SparseArrays.jl stdlib for SuiteSparse 7 --> - [x] #50719 <!-- fix `CyclePadding(::DataType)` --> - [x] #50694 <!-- inference: permit recursive type traits --> - [x] #50860 <!-- Add `Base.get_extension` to docs/API --> - [x] #50594 <!-- Disallow non-index Integer types in isassigned --> - [x] #50802 <!-- Makes IntrusiveLinkedListSynchronized mutable to avoid allocation on poptask --> - [x] #50858 <!-- Add a `threadpool` parameter to `Channel` constructor --> - [x] #50874 <!-- Restrict COFF to a single thread when symbol count is high --> - [x] #50822 <!-- Add default method for setmodifiers! --> - [x] #50730 <!-- Fix integer overflow in `isapprox` --> - [x] #50850 <!-- Remove weird Rational dispatch and add pi functions to list --> - [x] #50809 <!-- Limit type-printing in MethodError --> - [x] #50915 <!-- Add note the `Task` about sticky bit --> - [x] #50929 <!-- when widening tuple types in tmerge, only widen the complex parts --> - [x] #50928 <!-- Bump JuliaSyntax to 0.4.6 --> - [x] #50959 <!-- Update libssh2 patches --> - [x] #50823 <!-- Make ranges more robust with unsigned indexes. --> - [x] #48542 <!-- Add docs on task-specific buffering using multithreading --> - [x] #50912 <!-- Separate foreign threads into a :foreign threadpool --> - [x] #51010 <!-- Add ORIGIN to SuiteSparse rpath on Linux/FreeBSD --> - [x] #50753 <!-- cat: remove unused promote_eltype methods that confuse inference --> - [x] #51027 <!-- Implement realloc accounting correctly --> - [x] #51019 <!-- fix a case of potentially use of undefined variable when handling error in distributed message processing --> - [x] #51039 <!-- Revert "Optimize findall(f, ::AbstractArray{Bool}) (#42202)" --> - [x] #51036 <!-- add missing invoke edge for nospecialize targets --> - [x] #51042 <!-- inference: fix return_type_tfunc modeling of concrete functions --> - [x] #51114 <!-- Workaround upstream FreeBSD issue #272992 --> - [x] #50892 <!-- Add `JL_DLLIMPORT` to `small_typeof` declaration --> - [x] #51154 <!-- broadcast: use recursion rather than ntuple to map over a tuple --> - [x] #51153 <!-- fix debug typo in "add missing invoke edge for nospecialize targets (#51036)" --> - [x] #51222 <!-- Check again if the tty is open inside the IO lock --> - [x] #51236 <!-- Add lock around uv_unref during init --> - [x] #51243 <!-- GMP: Gracefully handle more overflows. --> - [x] #51254 <!-- Ryu: make sure adding zeros does not overwrite trailing dot --> - [x] #51175 <!-- shorten stale_age for cachefile lock --> - [x] #51300 <!-- fix method definition error for bad vararg --> - [x] #51307 <!-- fix force-throw ctrl-C on Windows --> - [x] #51303 <!-- ensure revising structs is safe --> - [x] #51393 - [x] #51403 Need manual backport: - [x] #51009 <!-- fix #50562, regression in `in` of tuple of Symbols --> - [x] #51053 <!-- Bump Statistics stdlib --> - [x] #51013 <!-- fix #50709, type bound error due to free typevar in sparam env --> - [x] #51305 <!-- reduce test time for rounding and floatfuncs --> Contains multiple commits, manual intervention needed: - [ ] #50663 <!-- Fix Expr(:loopinfo) codegen --> - [ ] #51035 <!-- refactor GC scanning code to reflect jl_binding_t are now first class --> - [ ] #51092 <!-- inference: fix bad effects for recursion --> - [x] #51247 <!-- Check if malloc has succeeded before incrementing gc stats --> - [x] #51294 <!-- use LibGit2_jll for LibGit2 library --> Non-merged PRs with backport label: - [ ] #51132 <!-- Handle `AbstractQ` in concatenation --> - [x] #51029 <!-- testdefs: make sure that if a test set changes the active project, they change it back when they're done --> - [ ] #50919 <!-- Code loading: do the "skipping mtime check for stdlib" check regardless of the value of `ispath(f)` --> - [ ] #50824 <!-- Add some aliasing warnings to docstrings for mutating functions --> - [x] #50385 <!-- Precompile pidlocks: add to NEWS and docs --> - [ ] #49805 <!-- Limit TimeType subtraction to AbstractDateTime -->
nalimilan
pushed a commit
that referenced
this pull request
Nov 5, 2023
… computed by `abstract_apply` (#51393) This commit adds special handling for `Vararg` types that may appear at the end of `argtypes`, as computed by `abstract_apply`. Even though PR within the abstract state, they can still be part of `argtypes`. As a result, this kind of special handling is still necessary. It remains an open question whether we can refactor `abstract_apply` to prevent `Vararg`s from appearing in `argtypes` in the first place.
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.
This commit adds special handling for
Varargtypes that may appear at the end ofargtypes, as computed byabstract_apply. Even though PR #42583 has ensured thatVarargandTypeVarshould never appear within the abstract state, they can still be part ofargtypes. As a result, this kind of special handling is still necessary. It remains an open question whether we can refactorabstract_applyto preventVarargs from appearing inargtypesin the first place.