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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 17f2dff28c3..947aeb4439e 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);
         });
     }
 }