Skip to content

Commit

Permalink
inference: thread lattice through memoryop type check
Browse files Browse the repository at this point in the history
We would probably need to backport similar changes to 1.10 too.

xref: aviatesk/JET.jl#589
  • Loading branch information
aviatesk committed Jan 6, 2024
1 parent b682592 commit 5354a8b
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions base/compiler/tfuncs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2084,12 +2084,13 @@ function array_type_undefable(@nospecialize(arytype))
return true
end

@nospecs function memoryset_typecheck(memtype, elemtype)
@nospecs function memoryset_typecheck(𝕃::AbstractLattice, memtype, elemtype)
# Check that we can determine the element type
isa(memtype, DataType) || return false
elemtype_expected = memoryref_elemtype(memtype)
elemtype_expected === Union{} && return false
# Check that the element type is compatible with the element we're assigning
βŠ‘ = Core.Compiler.:βŠ‘(𝕃)
elemtype βŠ‘ elemtype_expected || return false
return true
end
Expand Down Expand Up @@ -2122,17 +2123,17 @@ function memoryref_builtin_common_nothrow(argtypes::Vector{Any})
end
end

function memoryrefop_builtin_common_nothrow(argtypes::Vector{Any}, @nospecialize f)
function memoryrefop_builtin_common_nothrow(𝕃::AbstractLattice, argtypes::Vector{Any}, @nospecialize f)
ismemoryset = f === memoryrefset!
nargs = ismemoryset ? 4 : 3
length(argtypes) == nargs || return false
order = argtypes[2 + ismemoryset]
boundscheck = argtypes[3 + ismemoryset]
memtype = widenconst(argtypes[1])
memoryref_builtin_common_typecheck(boundscheck, memtype, order) || return false
memoryref_builtin_common_typecheck(𝕃, boundscheck, memtype, order) || return false
if ismemoryset
# Additionally check element type compatibility
memoryset_typecheck(memtype, argtypes[2]) || return false
memoryset_typecheck(𝕃, memtype, argtypes[2]) || return false
elseif f === memoryrefget
# If we could potentially throw undef ref errors, bail out now.
array_type_undefable(memtype) && return false
Expand All @@ -2147,7 +2148,8 @@ function memoryrefop_builtin_common_nothrow(argtypes::Vector{Any}, @nospecialize
return false
end

@nospecs function memoryref_builtin_common_typecheck(boundscheck, memtype, order)
@nospecs function memoryref_builtin_common_typecheck(𝕃::AbstractLattice, boundscheck, memtype, order)
βŠ‘ = Core.Compiler.:βŠ‘(𝕃)
return boundscheck βŠ‘ Bool && memtype βŠ‘ GenericMemoryRef && order βŠ‘ Symbol
end

Expand All @@ -2161,11 +2163,11 @@ end
memtype = widenconst(argtypes[1])
return memtype βŠ‘ GenericMemoryRef
elseif f === memoryrefset!
return memoryrefop_builtin_common_nothrow(argtypes, f)
return memoryrefop_builtin_common_nothrow(𝕃, argtypes, f)
elseif f === memoryrefget
return memoryrefop_builtin_common_nothrow(argtypes, f)
return memoryrefop_builtin_common_nothrow(𝕃, argtypes, f)
elseif f === memoryref_isassigned
return memoryrefop_builtin_common_nothrow(argtypes, f)
return memoryrefop_builtin_common_nothrow(𝕃, argtypes, f)
elseif f === Core._expr
length(argtypes) >= 1 || return false
return argtypes[1] βŠ‘ Symbol
Expand Down

0 comments on commit 5354a8b

Please sign in to comment.