urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-12-23 13:25:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix two weird bugs

Browse Source
This commit is contained in:
Philip Quirk 2024-05-30 16:52:45 -05:00
parent 654054b856
commit a520363432
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rust/ares/src/hamt.rs
View File

@ -345,18 +345,22 @@ impl<T: Copy + Preserve> Hamt<T> {
*new_leaf_buffer = (*n, t); *new_leaf_buffer = (*n, t);
let split = stem.hypothetical_index(chunk); let split = stem.hypothetical_index(chunk);
let new_buffer = stack.struct_alloc(stem.size() + 1); let new_buffer = stack.struct_alloc(stem.size() + 1);
copy_nonoverlapping(stem.buffer, new_buffer, split); if split > 0 {
copy_nonoverlapping(stem.buffer, new_buffer, split);
}
*new_buffer.add(split) = Entry { *new_buffer.add(split) = Entry {
leaf: Leaf { leaf: Leaf {
len: 1, len: 1,
buffer: new_leaf_buffer, buffer: new_leaf_buffer,
}, },
}; };
copy_nonoverlapping( if stem.size() - split > 0 {
stem.buffer.add(split), copy_nonoverlapping(
new_buffer.add(split + 1), stem.buffer.add(split),
stem.size() - split, new_buffer.add(split + 1),
); stem.size() - split,
);
}
*dest = Stem { *dest = Stem {
bitmap: stem.bitmap | chunk_to_bit(chunk), bitmap: stem.bitmap | chunk_to_bit(chunk),
typemap: stem.typemap & !chunk_to_bit(chunk), typemap: stem.typemap & !chunk_to_bit(chunk),
@ -628,8 +632,10 @@ impl<T: Copy + Persist> Persist for Hamt<T> {
let next_chunk = traversal[depth].bitmap.trailing_zeros(); let next_chunk = traversal[depth].bitmap.trailing_zeros();
let next_type = traversal[depth].typemap & (1 << next_chunk) != 0; let next_type = traversal[depth].typemap & (1 << next_chunk) != 0;
let next_entry = *traversal[depth].buffer; let next_entry = *traversal[depth].buffer;
traversal[depth].bitmap >>= next_chunk + 1; traversal[depth].bitmap >>= next_chunk;
traversal[depth].typemap >>= next_chunk + 1; traversal[depth].bitmap >>= 1;
traversal[depth].typemap >>= next_chunk;
traversal[depth].typemap >>= 1;
traversal[depth].buffer = traversal[depth].buffer.add(1); traversal[depth].buffer = traversal[depth].buffer.add(1);
if next_type { if next_type {
@ -707,8 +713,10 @@ impl<T: Copy + Persist> Persist for Hamt<T> {
let next_type = traversal[depth].typemap & (1 << next_chunk) != 0; let next_type = traversal[depth].typemap & (1 << next_chunk) != 0;
let next_entry_ptr = traversal[depth].buffer; let next_entry_ptr = traversal[depth].buffer;
traversal[depth].bitmap >>= next_chunk + 1; traversal[depth].bitmap >>= next_chunk;
traversal[depth].typemap >>= next_chunk + 1; traversal[depth].bitmap >>= 1;
traversal[depth].typemap >>= next_chunk;
traversal[depth].typemap >>= 1;
traversal[depth].buffer = traversal[depth].buffer.add(1); traversal[depth].buffer = traversal[depth].buffer.add(1);
if next_type { if next_type {