language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ensure literal loading happens independently in branches

Browse source
This commit is contained in:
Folkert 2023-04-09 14:41:16 +02:00
parent 45769b9044
commit 079dd4c51e
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/compiler/gen_dev/src/generic64/mod.rs
View file

@ -822,7 +822,11 @@ impl<
.storage_manager .storage_manager
.load_to_general_reg(&mut self.buf, cond_symbol); .load_to_general_reg(&mut self.buf, cond_symbol);
// this state is updated destructively in the branches. We don't want the branches to
// influence each other, so we must clone here.
let mut base_storage = self.storage_manager.clone(); let mut base_storage = self.storage_manager.clone();
let base_literal_map = self.literal_map.clone();
let mut max_branch_stack_size = 0; let mut max_branch_stack_size = 0;
let mut ret_jumps = bumpalo::vec![in self.env.arena]; let mut ret_jumps = bumpalo::vec![in self.env.arena];
let mut tmp = bumpalo::vec![in self.env.arena]; let mut tmp = bumpalo::vec![in self.env.arena];
@ -836,6 +840,7 @@ impl<
// Build all statements in this branch. Using storage as from before any branch. // Build all statements in this branch. Using storage as from before any branch.
self.storage_manager = base_storage.clone(); self.storage_manager = base_storage.clone();
self.literal_map = base_literal_map.clone();
self.build_stmt(stmt, ret_layout); self.build_stmt(stmt, ret_layout);
// Build unconditional jump to the end of this switch. // Build unconditional jump to the end of this switch.
@ -858,6 +863,7 @@ impl<
base_storage.update_fn_call_stack_size(self.storage_manager.fn_call_stack_size()); base_storage.update_fn_call_stack_size(self.storage_manager.fn_call_stack_size());
} }
self.storage_manager = base_storage; self.storage_manager = base_storage;
self.literal_map = base_literal_map;
self.storage_manager self.storage_manager
.update_stack_size(max_branch_stack_size); .update_stack_size(max_branch_stack_size);
let (_branch_info, stmt) = default_branch; let (_branch_info, stmt) = default_branch;

2
crates/compiler/test_gen/src/gen_tags.rs
View file

@ -1931,7 +1931,7 @@ fn match_on_result_with_uninhabited_error_branch() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm", feature = "gen-dev"))]
fn dispatch_tag_union_function_inferred() { fn dispatch_tag_union_function_inferred() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(