From 65d256e82a26ca6e72e6668adb66a284b4ad7ba1 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Sat, 11 Jun 2016 04:58:15 +0000
Subject: [PATCH] Support nested `cfg_attr` attributes

---
 src/libsyntax/config.rs                   |  2 +-
 src/test/compile-fail/nested-cfg-attrs.rs | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/nested-cfg-attrs.rs

diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs
index c164e89c52f38..207289de34707 100644
--- a/src/libsyntax/config.rs
+++ b/src/libsyntax/config.rs
@@ -78,7 +78,7 @@ impl<'a> StripUnconfigured<'a> {
         };
 
         if attr::cfg_matches(self.config, &cfg, &mut self.diag) {
-            Some(respan(mi.span, ast::Attribute_ {
+            self.process_cfg_attr(respan(mi.span, ast::Attribute_ {
                 id: attr::mk_attr_id(),
                 style: attr.node.style,
                 value: mi.clone(),
diff --git a/src/test/compile-fail/nested-cfg-attrs.rs b/src/test/compile-fail/nested-cfg-attrs.rs
new file mode 100644
index 0000000000000..6010b1e695e9b
--- /dev/null
+++ b/src/test/compile-fail/nested-cfg-attrs.rs
@@ -0,0 +1,14 @@
+// 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.
+
+#[cfg_attr(all(), cfg_attr(all(), cfg(foo)))]
+fn f() {}
+
+fn main() { f() } //~ ERROR unresolved name `f`