max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(runtime/object): bug at array_push

Browse source 
Small object allocator was masking this bug.
This commit is contained in:
Leonardo de Moura 2019-02-26 14:19:37 -08:00
parent d128af10f9
commit 2a0f5186e8
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/runtime/object.cpp
View file

@ -1790,7 +1790,9 @@ object * mk_array(obj_arg n, obj_arg v) {
obj_res copy_array(obj_arg a, bool expand) {
size_t sz = array_size(a);
size_t cap = array_capacity(a);
lean_assert(cap >= sz);
if (expand) cap = (cap + 1) * 2;
lean_assert(!expand || cap > sz);
object * r = alloc_array(sz, cap);
object ** it = array_cptr(a);
object ** end = it + sz;
@ -1811,10 +1813,11 @@ object * array_push(obj_arg a, obj_arg v) {
else
r = copy_array(a, true);
} else {
r = copy_array(a, array_capacity(a) < 2*array_size(a));
r = copy_array(a, array_capacity(a) < 2*array_size(a) + 1);
}
size_t & sz = to_array(r)->m_size;
object ** it = array_cptr(r) + sz;
lean_assert(array_capacity(r) > array_size(r));
size_t & sz = to_array(r)->m_size;
object ** it = array_cptr(r) + sz;
*it = v;
sz++;
return r;