language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Compiler: remove more indeterminism in the order of statements

Browse source
This commit is contained in:
Olivier Goffart 2025-02-15 10:51:42 +01:00
parent b2e7b0ec7d
commit 7c75720c9a
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/compiler/passes/deduplicate_property_read.rs
View file

@ -8,7 +8,7 @@ use crate::langtype::Type;
use crate::object_tree::*;
use smol_str::{format_smolstr, SmolStr};
use std::cell::RefCell;
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
pub fn deduplicate_property_read(component: &Component) {
visit_all_expressions(component, |expr, ty| {
@ -106,17 +106,21 @@ fn process_expression(expr: &mut Expression, old_state: &DedupPropState) {
}
if new_state.counts.borrow().has_duplicate {
let mut stores = vec![];
let mut stores = BTreeMap::<SmolStr, NamedReference>::new();
for (nr, c) in &new_state.counts.borrow().counts {
if c.has_been_mapped {
stores.push(Expression::StoreLocalVariable {
name: map_nr(nr),
value: Box::new(Expression::PropertyReference(nr.clone())),
});
stores.insert(map_nr(nr), nr.clone());
}
}
stores.push(std::mem::take(expr));
*expr = Expression::CodeBlock(stores);
let mut exprs = stores
.into_iter()
.map(|(name, nr)| Expression::StoreLocalVariable {
name,
value: Box::new(Expression::PropertyReference(nr)),
})
.collect::<Vec<_>>();
exprs.push(std::mem::take(expr));
*expr = Expression::CodeBlock(exprs);
}
}