language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Extract common code from both branches

Browse source
This commit is contained in:
Richard Feldman 2022-01-29 21:55:43 -05:00
parent c3123de737
commit fbedc3ba13
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/src/repl/eval.rs
View file

@ -241,16 +241,16 @@ fn tag_id_from_recursive_ptr<'a, M: AppMemory>(
rec_addr: usize,
) -> (i64, usize) {
let tag_in_ptr = union_layout.stores_tag_id_in_pointer(env.target_info);
let addr_with_id = env.app_memory.deref_usize(rec_addr);
if tag_in_ptr {
let addr_with_id = env.app_memory.deref_usize(rec_addr);
let (_, tag_id_mask) = UnionLayout::tag_id_pointer_bits_and_mask(env.target_info);
let tag_id = addr_with_id & tag_id_mask;
let data_addr = addr_with_id & !tag_id_mask;
(tag_id as i64, data_addr)
} else {
let data_addr = env.app_memory.deref_usize(rec_addr);
let tag_id = tag_id_from_data(env, union_layout, data_addr);
(tag_id, data_addr)
let tag_id = tag_id_from_data(env, union_layout, addr_with_id);
(tag_id, addr_with_id)
}
}