diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-22 06:46:23 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-02-22 06:46:23 +0000 |
| commit | 150d853343758281f7b0c44e058ea81da45b79be (patch) | |
| tree | 7aef40d8cf14fa4619829e5274b8e5366d397a4b /lib/Parse/ParseDeclCXX.cpp | |
| parent | 425663a16cc0d1bbd6764300f8a59251057dffe8 (diff) | |
Don't skip '_Alignas' when disambiguating 'final'. '_Alignas' can't appear here,
and we used to assert if it did.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175866 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 13 |
1 files changed, 3 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); |