From 445340771d8ead72709bbbaffc0b576389985264 Mon Sep 17 00:00:00 2001
From: Luqman Aden <me@luqman.ca>
Date: Sat, 19 Jul 2014 00:06:43 -0700
Subject: libsyntax: Don't ICE on macro invocation in count expr of fixed array
 type.

---
 src/libsyntax/ext/expand.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/libsyntax')

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index f82796b480a..a51a79b6d58 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -536,13 +536,16 @@ fn expand_non_macro_stmt(s: &Stmt, fld: &mut MacroExpander)
                 } => {
                     // take it apart:
                     let Local {
-                        ty: _,
+                        ty: ty,
                         pat: pat,
                         init: init,
                         id: id,
                         span: span,
                         source: source,
                     } = **local;
+                    // expand the ty since TyFixedLengthVec contains an Expr
+                    // and thus may have a macro use
+                    let expanded_ty = fld.fold_ty(ty);
                     // expand the pat (it might contain macro uses):
                     let expanded_pat = fld.fold_pat(pat);
                     // find the PatIdents in the pattern:
@@ -566,7 +569,7 @@ fn expand_non_macro_stmt(s: &Stmt, fld: &mut MacroExpander)
                     let new_init_opt = init.map(|e| fld.fold_expr(e));
                     let rewritten_local =
                         box(GC) Local {
-                            ty: local.ty,
+                            ty: expanded_ty,
                             pat: rewritten_pat,
                             init: new_init_opt,
                             id: id,
-- 
cgit 1.4.1-3-g733a5