From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 1 Jul 2015 18:56:50 +0000 (+0000)
Subject: [modules] Skip trailing attributes when skipping a class definition during parse... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30b84f2bb193ce62ad682dbe9de31d9fd0c7e9fd;p=clang

[modules] Skip trailing attributes when skipping a class definition during parse-merging.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@241180 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 42374f6e45..568896db42 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -2769,6 +2769,11 @@ void Parser::SkipCXXMemberSpecification(SourceLocation RecordLoc,
   BalancedDelimiterTracker T(*this, tok::l_brace);
   T.consumeOpen();
   T.skipToEnd();
+
+  // Parse and discard any trailing attributes.
+  ParsedAttributes Attrs(AttrFactory);
+  if (Tok.is(tok::kw___attribute))
+    MaybeParseGNUAttributes(Attrs);
 }
 
 /// ParseCXXMemberSpecification - Parse the class definition.
diff --git a/test/Modules/Inputs/submodules-merge-defs/defs.h b/test/Modules/Inputs/submodules-merge-defs/defs.h
index 8b6fec60fc..a8f38387e4 100644
--- a/test/Modules/Inputs/submodules-merge-defs/defs.h
+++ b/test/Modules/Inputs/submodules-merge-defs/defs.h
@@ -80,3 +80,7 @@ namespace SeparateInline {
   void f() {}
   constexpr int g() { return 0; }
 }
+
+namespace TrailingAttributes {
+  template<typename T> struct X {} __attribute__((aligned(8)));
+}