From 67aeebddc98ab1db1128b148c3d1ac873dd5adcf Mon Sep 17 00:00:00 2001 From: Keno Fischer Date: Sun, 15 Oct 2023 00:46:25 +0000 Subject: [PATCH] Address review comments --- base/compiler/abstractinterpretation.jl | 2 +- base/compiler/typelattice.jl | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/base/compiler/abstractinterpretation.jl b/base/compiler/abstractinterpretation.jl index d19d27ec42c8d..00e9ef48d9fe2 100644 --- a/base/compiler/abstractinterpretation.jl +++ b/base/compiler/abstractinterpretation.jl @@ -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] diff --git a/base/compiler/typelattice.jl b/base/compiler/typelattice.jl index df6022609d612..0c44a610f8f95 100644 --- a/base/compiler/typelattice.jl +++ b/base/compiler/typelattice.jl @@ -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]