From 316f7bb1a8be22a585a8edb6a4bcb84869ca53dd Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Thu, 29 Sep 2016 02:23:19 +0000 Subject: [PATCH] Fix ICE on a macro in a constant integer position that expands into other macros. --- src/librustc_resolve/macros.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index 17f2dff28c3f..947aeb4439e1 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -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 { + 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) - } else if let Expansion::Expr(ref expr) = *expansion { - def_collector.visit_ast_const_integer(expr); }); } }