mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Don't invalid body query results when generating desugared names

Browse Source
This commit is contained in:
Lukas Wirth 2024-03-07 15:02:12 +01:00
parent c04c0dd5ba
commit 09b9a921a8
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/hir-def/src/body/lower.rs
View File

@ -703,7 +703,8 @@ fn desugar_try_block(&mut self, e: BlockExpr) -> ExprId {
let Some(try_from_output) = LangItem::TryTraitFromOutput.path(self.db, self.krate) else { let Some(try_from_output) = LangItem::TryTraitFromOutput.path(self.db, self.krate) else {
return self.collect_block(e); return self.collect_block(e);
}; };
let label = self.alloc_label_desugared(Label { name: Name::generate_new_name() }); let label = self
.alloc_label_desugared(Label { name: Name::generate_new_name(self.body.labels.len()) });
let old_label = self.current_try_block_label.replace(label); let old_label = self.current_try_block_label.replace(label);
let (btail, expr_id) = self.with_labeled_rib(label, |this| { let (btail, expr_id) = self.with_labeled_rib(label, |this| {
@ -840,7 +841,7 @@ fn collect_for_loop(&mut self, syntax_ptr: AstPtr<ast::Expr>, e: ast::ForExpr) -
this.collect_expr_opt(e.loop_body().map(|it| it.into())) this.collect_expr_opt(e.loop_body().map(|it| it.into()))
}), }),
}; };
let iter_name = Name::generate_new_name(); let iter_name = Name::generate_new_name(self.body.exprs.len());
let iter_expr = self.alloc_expr(Expr::Path(Path::from(iter_name.clone())), syntax_ptr); let iter_expr = self.alloc_expr(Expr::Path(Path::from(iter_name.clone())), syntax_ptr);
let iter_expr_mut = self.alloc_expr( let iter_expr_mut = self.alloc_expr(
Expr::Ref { expr: iter_expr, rawness: Rawness::Ref, mutability: Mutability::Mut }, Expr::Ref { expr: iter_expr, rawness: Rawness::Ref, mutability: Mutability::Mut },
@ -901,7 +902,7 @@ fn collect_try_operator(&mut self, syntax_ptr: AstPtr<ast::Expr>, e: ast::TryExp
Expr::Call { callee: try_branch, args: Box::new([operand]), is_assignee_expr: false }, Expr::Call { callee: try_branch, args: Box::new([operand]), is_assignee_expr: false },
syntax_ptr, syntax_ptr,
); );
let continue_name = Name::generate_new_name(); let continue_name = Name::generate_new_name(self.body.bindings.len());
let continue_binding = let continue_binding =
self.alloc_binding(continue_name.clone(), BindingAnnotation::Unannotated); self.alloc_binding(continue_name.clone(), BindingAnnotation::Unannotated);
let continue_bpat = let continue_bpat =
@ -916,7 +917,7 @@ fn collect_try_operator(&mut self, syntax_ptr: AstPtr<ast::Expr>, e: ast::TryExp
guard: None, guard: None,
expr: self.alloc_expr(Expr::Path(Path::from(continue_name)), syntax_ptr), expr: self.alloc_expr(Expr::Path(Path::from(continue_name)), syntax_ptr),
}; };
let break_name = Name::generate_new_name(); let break_name = Name::generate_new_name(self.body.bindings.len());
let break_binding = self.alloc_binding(break_name.clone(), BindingAnnotation::Unannotated); let break_binding = self.alloc_binding(break_name.clone(), BindingAnnotation::Unannotated);
let break_bpat = self.alloc_pat_desugared(Pat::Bind { id: break_binding, subpat: None }); let break_bpat = self.alloc_pat_desugared(Pat::Bind { id: break_binding, subpat: None });
self.add_definition_to_binding(break_binding, break_bpat); self.add_definition_to_binding(break_binding, break_bpat);

14
crates/hir-expand/src/name.rs
View File

@ -111,15 +111,11 @@ pub fn is_missing(&self) -> bool {
self == &Name::missing() self == &Name::missing()
} }
/// Generates a new name which is only equal to itself, by incrementing a counter. Due /// Generates a new name that attempts to be unique. Should only be used when body lowering and
/// its implementation, it should not be used in things that salsa considers, like /// creating desugared locals and labels. The caller is responsible for picking an index
/// type names or field names, and it should be only used in names of local variables /// that is stable across re-executions
/// and labels and similar things. pub fn generate_new_name(idx: usize) -> Name {
pub fn generate_new_name() -> Name { Name::new_text(format_smolstr!("<ra@gennew>{idx}"))
use std::sync::atomic::{AtomicUsize, Ordering};
static CNT: AtomicUsize = AtomicUsize::new(0);
let c = CNT.fetch_add(1, Ordering::Relaxed);
Name::new_text(format_smolstr!("<ra@gennew>{c}"))
} }
/// Returns the tuple index this name represents if it is a tuple field. /// Returns the tuple index this name represents if it is a tuple field.