diff options
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 13 | ||||
| -rw-r--r-- | test/Parser/cxx0x-ambig.cpp | 3 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 22f5863e5f..90926a362b 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1293,9 +1293,8 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, // Okay, this is a class definition. TUK = Sema::TUK_Definition; } - } else if (isCXX11FinalKeyword() && (NextToken().is(tok::l_square) || - NextToken().is(tok::kw_alignas) || - NextToken().is(tok::kw__Alignas))) { + } else if (isCXX11FinalKeyword() && (NextToken().is(tok::l_square) || + NextToken().is(tok::kw_alignas))) { // We can't tell if this is a definition or reference // until we skipped the 'final' and C++11 attribute specifiers. TentativeParsingAction PA(*this); @@ -1309,8 +1308,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, ConsumeBracket(); if (!SkipUntil(tok::r_square)) break; - } else if ((Tok.is(tok::kw_alignas) || Tok.is(tok::kw__Alignas)) && - NextToken().is(tok::l_paren)) { + } else if (Tok.is(tok::kw_alignas) && NextToken().is(tok::l_paren)) { ConsumeToken(); ConsumeParen(); if (!SkipUntil(tok::r_paren)) @@ -1503,11 +1501,6 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, TemplateParams? &(*TemplateParams)[0] : 0, TemplateParams? TemplateParams->size() : 0)); } else { - if (TemplateInfo.Kind == ParsedTemplateInfo::ExplicitInstantiation && - TUK == Sema::TUK_Definition) { - // FIXME: Diagnose this particular error. - } - if (TUK != Sema::TUK_Declaration && TUK != Sema::TUK_Definition) ProhibitAttributes(attrs); diff --git a/test/Parser/cxx0x-ambig.cpp b/test/Parser/cxx0x-ambig.cpp index ac9c75ea68..dac3c099fc 100644 --- a/test/Parser/cxx0x-ambig.cpp +++ b/test/Parser/cxx0x-ambig.cpp @@ -25,6 +25,9 @@ namespace final { struct T final : S {}; // expected-error {{base 'S' is marked 'final'}} struct T bar : S {}; // expected-error {{expected ';' after top level declarator}} expected-error {{expected unqualified-id}} } + // _Alignas isn't allowed in the places where alignas is. We used to + // assert on this. + struct U final _Alignas(4) {}; // expected-error 3{{}} expected-note {{}} } // enum versus bitfield mess. |