mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add recursive limit in expression macro expansion

Browse source
This commit is contained in:
Edwin Cheng 2020-03-21 23:55:20 +08:00
parent 92b561b5c7
commit 92cc6c9816
1 changed files with 8 additions and 1 deletions

9
crates/ra_hir_def/src/body.rs
View file

@ -30,6 +30,7 @@ pub(crate) struct Expander {
hygiene: Hygiene, hygiene: Hygiene,
ast_id_map: Arc<AstIdMap>, ast_id_map: Arc<AstIdMap>,
module: ModuleId, module: ModuleId,
recursive_limit: usize,
} }
impl Expander { impl Expander {
@ -41,7 +42,7 @@ impl Expander {
let crate_def_map = db.crate_def_map(module.krate); let crate_def_map = db.crate_def_map(module.krate);
let hygiene = Hygiene::new(db.upcast(), current_file_id); let hygiene = Hygiene::new(db.upcast(), current_file_id);
let ast_id_map = db.ast_id_map(current_file_id); let ast_id_map = db.ast_id_map(current_file_id);
Expander { crate_def_map, current_file_id, hygiene, ast_id_map, module } Expander { crate_def_map, current_file_id, hygiene, ast_id_map, module, recursive_limit: 0 }
} }
pub(crate) fn enter_expand<T: ast::AstNode>( pub(crate) fn enter_expand<T: ast::AstNode>(
@ -50,6 +51,10 @@ impl Expander {
local_scope: Option<&ItemScope>, local_scope: Option<&ItemScope>,
macro_call: ast::MacroCall, macro_call: ast::MacroCall,
) -> Option<(Mark, T)> { ) -> Option<(Mark, T)> {
if self.recursive_limit > 1024 {
return None;
}
let macro_call = InFile::new(self.current_file_id, &macro_call); let macro_call = InFile::new(self.current_file_id, &macro_call);
if let Some(call_id) = macro_call.as_call_id(db, |path| { if let Some(call_id) = macro_call.as_call_id(db, |path| {
@ -73,6 +78,7 @@ impl Expander {
self.hygiene = Hygiene::new(db.upcast(), file_id); self.hygiene = Hygiene::new(db.upcast(), file_id);
self.current_file_id = file_id; self.current_file_id = file_id;
self.ast_id_map = db.ast_id_map(file_id); self.ast_id_map = db.ast_id_map(file_id);
self.recursive_limit += 1;
return Some((mark, expr)); return Some((mark, expr));
} }
@ -88,6 +94,7 @@ impl Expander {
self.hygiene = Hygiene::new(db.upcast(), mark.file_id); self.hygiene = Hygiene::new(db.upcast(), mark.file_id);
self.current_file_id = mark.file_id; self.current_file_id = mark.file_id;
self.ast_id_map = mem::take(&mut mark.ast_id_map); self.ast_id_map = mem::take(&mut mark.ast_id_map);
self.recursive_limit -= 1;
mark.bomb.defuse(); mark.bomb.defuse();
} }