From 316f7bb1a8be22a585a8edb6a4bcb84869ca53dd Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Thu, 29 Sep 2016 02:23:19 +0000
Subject: [PATCH 1/2] 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 17f2dff28c3f4..947aeb4439e16 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);
         });
     }
 }

From 4bec961a218efb44ee6eba77c5fc76207f168195 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Thu, 29 Sep 2016 03:52:04 +0000
Subject: [PATCH 2/2] Add regression test.

---
 src/test/run-pass/issue-36816.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/test/run-pass/issue-36816.rs

diff --git a/src/test/run-pass/issue-36816.rs b/src/test/run-pass/issue-36816.rs
new file mode 100644
index 0000000000000..22f3a52b26e74
--- /dev/null
+++ b/src/test/run-pass/issue-36816.rs
@@ -0,0 +1,16 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+macro_rules! m { () => { 1 } }
+macro_rules! n { () => { 1 + m!() } }
+
+fn main() {
+    let _: [u32; n!()] = [0, 0];
+}