Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Keno committed Oct 15, 2023
1 parent 0e6ce91 commit 67aeebd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion base/compiler/abstractinterpretation.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2981,7 +2981,7 @@ function update_bestguess!(interp::AbstractInterpreter, frame::InferenceState,
end
end

function propagate_to_error_handler!(frame::InferenceState, currpc::Int, W, 𝕃ᵢ, currstate)
function propagate_to_error_handler!(frame::InferenceState, currpc::Int, W::BitSet, 𝕃ᵢ::AbstractLattice, currstate::VarTable)
# If this statement potentially threw, propagate the currstate to the
# exception handler, BEFORE applying any state changes.
cur_hand = frame.handler_at[currpc]
Expand Down
18 changes: 0 additions & 18 deletions base/compiler/typelattice.jl
Original file line number Diff line number Diff line change
Expand Up @@ -759,24 +759,6 @@ function stupdate!(lattice::AbstractLattice, state::VarTable, changes::VarTable)
return changed
end

function stupdate1!(lattice::AbstractLattice, state::VarTable, change::StateUpdate)
changeid = slot_id(change.var)
for i = 1:length(state)
invalidated = invalidate_slotwrapper(state[i], changeid, change.conditional)
if invalidated !== nothing
state[i] = invalidated
end
end
# and update the type of it
newtype = change.vtype
oldtype = state[changeid]
if schanged(lattice, newtype, oldtype)
state[changeid] = smerge(lattice, oldtype, newtype)
return true
end
return false
end

function stoverwrite!(state::VarTable, newstate::VarTable)
for i = 1:length(state)
state[i] = newstate[i]
Expand Down

0 comments on commit 67aeebd

Please sign in to comment.