From 0606cf73b4d78373af2619cde703dcf86ff0e30a Mon Sep 17 00:00:00 2001
From: Abramo Bagnara <abramo.bagnara@bugseng.com>
Date: Sat, 16 Aug 2014 08:29:27 +0000
Subject: [PATCH] Uniformed parsing of GNU attributes at line beginnning and
 added GNU attributes parsing FIXMEs.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@215814 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Parse/ParseDeclCXX.cpp |  3 +++
 test/Parser/attributes.c   | 10 ++++++++++
 test/Sema/gnu-attributes.c | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 test/Sema/gnu-attributes.c

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 380b6d7794..99cb853b7d 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -1068,6 +1068,9 @@ bool Parser::isValidAfterTypeSpecifier(bool CouldBeBitfield) {
   case tok::kw___declspec:      // struct foo {...} __declspec(...)
   case tok::l_square:           // void f(struct f  [         3])
   case tok::ellipsis:           // void f(struct f  ...       [Ns])
+  // FIXME: we should emit semantic diagnostic when declaration
+  // attribute is in type attribute position.
+  case tok::kw___attribute:     // struct foo __attribute__((used)) x;
     return true;
   case tok::colon:
     return CouldBeBitfield;     // enum E { ... }   :         2;
diff --git a/test/Parser/attributes.c b/test/Parser/attributes.c
index 3d69c72c32..b815b8da3d 100644
--- a/test/Parser/attributes.c
+++ b/test/Parser/attributes.c
@@ -95,3 +95,13 @@ void testFundef5() __attribute__(()) { }
 __attribute__((pure)) int testFundef6(int a) { return a; }
 
 void deprecatedTestFun(void) __attribute__((deprecated()));
+
+struct s {
+  int a;
+};
+
+// This test ensure compatibility with parsing GNU-style attributes
+// where the attribute is on a separate line from the elaborated type
+// specifier.
+struct s
+__attribute__((used)) bar;
diff --git a/test/Sema/gnu-attributes.c b/test/Sema/gnu-attributes.c
new file mode 100644
index 0000000000..653fae826a
--- /dev/null
+++ b/test/Sema/gnu-attributes.c
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
+
+struct s {};
+
+// FIXME: should warn that declaration attribute in type position is
+// being applied to the declaration instead?
+struct s __attribute__((used)) foo;
+
+// FIXME: Should warn that type attribute in declaration position is
+// being applied to the type instead?
+struct s  *bar __attribute__((address_space(1)));
+
+// Should not warn because type attribute is in type position.
+struct s *__attribute__((address_space(1))) baz;
+
+// Should not warn because declaration attribute is in declaration position.
+struct s *quux __attribute__((used));
-- 
2.40.0