Skip to content

Hook up effect modeling for TypeVar and UnionAll #48063

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
merged 2 commits into from
Jan 2, 2023
Merged

Hook up effect modeling for TypeVar and UnionAll #48063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b5fcf8
Hook up effect modeling for `TypeVar` and `UnionAll`
Keno Dec 31, 2022
9aa83e7
Apply suggestions from code review
Keno Jan 1, 2023
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
23 changes: 14 additions & 9 deletions base/compiler/abstractinterpretation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1834,35 +1834,38 @@ end
function abstract_call_unionall(argtypes::Vector{Any})
if length(argtypes) == 3
canconst = true
a2 = argtypes[2]
a3 = argtypes[3]
nothrow = a2 ⊑ TypeVar && (
a3 ⊑ Type ||
a3 ⊑ TypeVar)
if isa(a3, Const)
body = a3.val
elseif isType(a3)
body = a3.parameters[1]
canconst = false
else
return Any
return CallMeta(Any, Effects(EFFECTS_TOTAL; nothrow), NoCallInfo())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return CallMeta(Any, Effects(EFFECTS_TOTAL; nothrow), NoCallInfo())
return CallMeta(Any, EFFECTS_THROWS, NoCallInfo())

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one I think in theory could be proven nothrow, even if we don't model the rt.

end
if !isa(body, Type) && !isa(body, TypeVar)
return Any
return CallMeta(Any, EFFECTS_THROWS, NoCallInfo())
end
if has_free_typevars(body)
a2 = argtypes[2]
if isa(a2, Const)
tv = a2.val
elseif isa(a2, PartialTypeVar)
tv = a2.tv
canconst = false
else
return Any
return CallMeta(Any, EFFECTS_THROWS, NoCallInfo())
end
!isa(tv, TypeVar) && return Any
!isa(tv, TypeVar) && return CallMeta(Any, EFFECTS_THROWS, NoCallInfo())
body = UnionAll(tv, body)
end
ret = canconst ? Const(body) : Type{body}
return ret
return CallMeta(ret, Effects(EFFECTS_TOTAL; nothrow), NoCallInfo())
end
return Any
return CallMeta(Any, EFFECTS_UNKNOWN, NoCallInfo())
end

function abstract_invoke(interp::AbstractInterpreter, (; fargs, argtypes)::ArgInfo, si::StmtInfo, sv::InferenceState)
Expand Down Expand Up @@ -1974,9 +1977,11 @@ function abstract_call_known(interp::AbstractInterpreter, @nospecialize(f),
elseif la == 3
ub_var = argtypes[3]
end
return CallMeta(typevar_tfunc(𝕃ᵢ, n, lb_var, ub_var), EFFECTS_UNKNOWN, NoCallInfo())
pT = typevar_tfunc(𝕃ᵢ, n, lb_var, ub_var)
return CallMeta(pT,
builtin_effects(𝕃ᵢ, Core._typevar, Any[n, lb_var, ub_var], pT), NoCallInfo())
elseif f === UnionAll
return CallMeta(abstract_call_unionall(argtypes), EFFECTS_UNKNOWN, NoCallInfo())
return abstract_call_unionall(argtypes)
elseif f === Tuple && la == 2
aty = argtypes[2]
ty = isvarargtype(aty) ? unwrapva(aty) : widenconst(aty)
Expand Down
1 change: 1 addition & 0 deletions base/compiler/tfuncs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,7 @@ const _INACCESSIBLEMEM_BUILTINS = Any[
typeassert,
typeof,
compilerbarrier,
Core._typevar
]

const _ARGMEM_BUILTINS = Any[
Expand Down