diff options
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 9 | ||||
| -rw-r--r-- | test/Parser/cxx0x-attributes.cpp | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 8c24f9761f..96c57581e8 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -2976,15 +2976,22 @@ void Parser::ParseEnumSpecifier(SourceLocation StartLoc, DeclSpec &DS, SourceLocation ScopedEnumKWLoc; bool IsScopedUsingClassTag = false; + // In C++11, recognize 'enum class' and 'enum struct'. if (getLangOpts().CPlusPlus0x && (Tok.is(tok::kw_class) || Tok.is(tok::kw_struct))) { Diag(Tok, diag::warn_cxx98_compat_scoped_enum); IsScopedUsingClassTag = Tok.is(tok::kw_class); ScopedEnumKWLoc = ConsumeToken(); + // Attributes are not allowed between these keywords. Diagnose, + // but then just treat them like they appeared in the right place. ProhibitAttributes(attrs); - // Recovery: assume that the attributes came after the tag. + + // They are allowed afterwards, though. + MaybeParseGNUAttributes(attrs); MaybeParseCXX0XAttributes(attrs); + while (Tok.is(tok::kw___declspec)) + ParseMicrosoftDeclSpec(attrs); } // C++11 [temp.explicit]p12: diff --git a/test/Parser/cxx0x-attributes.cpp b/test/Parser/cxx0x-attributes.cpp index db5eebfaac..a0b8467bcc 100644 --- a/test/Parser/cxx0x-attributes.cpp +++ b/test/Parser/cxx0x-attributes.cpp @@ -207,3 +207,8 @@ void baz () { for ([[]] int n : { 1, 2, 3 }) { } } + +enum class __attribute__((visibility("hidden"))) SecretKeepers { + one, /* rest are deprecated */ two, three +}; +enum class [[]] EvenMoreSecrets {}; |