From 67af16e94b617a8f1aed8a85913a1f3fff87ed25 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Tue, 19 Sep 2023 18:03:36 +0000 Subject: [PATCH] fixup! improve tests --- base/array.jl | 6 +++--- base/expr.jl | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/array.jl b/base/array.jl index dc0a507a72eb2..1847eada486e0 100644 --- a/base/array.jl +++ b/base/array.jl @@ -1117,7 +1117,7 @@ end array_new_memory(mem::Memory, newlen::Int) = typeof(mem)(undef, newlen) # TODO: when implemented, this should use a memory growing call -@assume_effects :terminates_locally function _growbeg!(a::Vector, delta::Integer) +function _growbeg!(a::Vector, delta::Integer) delta = Int(delta) delta == 0 && return # avoid attempting to index off the end delta >= 0 || throw(ArgumentError("grow requires delta >= 0")) @@ -1156,7 +1156,7 @@ array_new_memory(mem::Memory, newlen::Int) = typeof(mem)(undef, newlen) # TODO: return end -@assume_effects :terminates_locally function _growend!(a::Vector, delta::Integer) +function _growend!(a::Vector, delta::Integer) delta = Int(delta) delta >= 0 || throw(ArgumentError("grow requires delta >= 0")) ref = a.ref @@ -1193,7 +1193,7 @@ end return end -@assume_effects :terminates_locally function _growat!(a::Vector, i::Integer, delta::Integer) +function _growat!(a::Vector, i::Integer, delta::Integer) delta = Int(delta) i == 1 && return _growbeg!(a, delta) len = length(a) diff --git a/base/expr.jl b/base/expr.jl index 9d6ed3278fe8a..f8c13a6c8c9c4 100644 --- a/base/expr.jl +++ b/base/expr.jl @@ -716,7 +716,8 @@ macro assume_effects(args...) end (consistent, effect_free, nothrow, terminates_globally, terminates_locally, notaskstate, inaccessiblememonly, noub) = (false, false, false, false, false, false, false, false, false) - for org_setting in args[1:idx] + for i in 1:idx + org_setting = args[i] (setting, val) = compute_assumed_setting(org_setting) if setting === :consistent consistent = val