nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 23:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ICE on a macro in a constant integer position that expands into other macros.

Browse Source
This commit is contained in:
Jeffrey Seyfried 2016-09-29 02:23:19 +00:00
parent 755516bb96
commit 316f7bb1a8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc_resolve/macros.rs
View File

@ -172,10 +172,13 @@ impl<'a> Resolver<'a> {
let mut def_collector = DefCollector::new(&mut self.definitions);
def_collector.visit_macro_invoc = Some(visit_macro_invoc);
def_collector.with_parent(def_index, |def_collector| if !const_integer {
expansion.visit_with(def_collector)
} else if let Expansion::Expr(ref expr) = *expansion {
def_collector.with_parent(def_index, |def_collector| {
if const_integer {
if let Expansion::Expr(ref expr) = *expansion {
def_collector.visit_ast_const_integer(expr);
}
}
expansion.visit_with(def_collector)
});
}
}