diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-17 01:30:42 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-17 01:30:42 +0000 |
| commit | cd8ab51a44e80625d84126780b0d85a7732e25af (patch) | |
| tree | eb8a9f189b8553a98c361192ddb816b8f1703d5c /lib/Parse/ParseDeclCXX.cpp | |
| parent | 6c3af3d0e3e65bcbca57bfd458d684941f6d0531 (diff) | |
Implement C++11 semantics for [[noreturn]] attribute. This required splitting
it apart from [[gnu::noreturn]] / __attribute__((noreturn)), since their
semantics are not equivalent (for instance, we treat [[gnu::noreturn]] as
affecting the function type, whereas [[noreturn]] does not).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172691 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 7fe49fd995..d78cc51a77 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -3032,7 +3032,7 @@ static bool IsBuiltInOrStandardCXX11Attribute(IdentifierInfo *AttrName, AttributeList::AS_CXX11)) { case AttributeList::AT_CarriesDependency: case AttributeList::AT_FallThrough: - case AttributeList::AT_NoReturn: { + case AttributeList::AT_CXX11NoReturn: { return true; } @@ -3095,6 +3095,8 @@ void Parser::ParseCXX11AttributeSpecifier(ParsedAttributes &attrs, ConsumeBracket(); ConsumeBracket(); + llvm::SmallDenseMap<IdentifierInfo*, SourceLocation, 4> SeenAttrs; + while (Tok.isNot(tok::r_square)) { // attribute not present if (Tok.is(tok::comma)) { @@ -3128,6 +3130,11 @@ void Parser::ParseCXX11AttributeSpecifier(ParsedAttributes &attrs, bool StandardAttr = IsBuiltInOrStandardCXX11Attribute(AttrName,ScopeName); bool AttrParsed = false; + if (StandardAttr && + !SeenAttrs.insert(std::make_pair(AttrName, AttrLoc)).second) + Diag(AttrLoc, diag::err_cxx11_attribute_repeated) + << AttrName << SourceRange(SeenAttrs[AttrName]); + // Parse attribute arguments if (Tok.is(tok::l_paren)) { if (ScopeName && ScopeName->getName() == "gnu") { |