[cfe-commits] r172691 - in /cfe/trunk: include/clang/AST/ include/clang/Basic/ include/clang/Sema/ lib/AST/ lib/Analysis/ lib/CodeGen/ lib/Parse/ lib/Sema/ lib/StaticAnalyzer/Checkers/ test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/ test/CXX/expr/expr.prim/expr.prim.lambda/ test/CodeGenCXX/ test/Parser/
David Blaikie
dblaikie at gmail.com
Wed Jan 16 18:45:37 PST 2013
On Wed, Jan 16, 2013 at 5:30 PM, Richard Smith
<richard-llvm at metafoo.co.uk> wrote:
> Author: rsmith
> Date: Wed Jan 16 19:30:42 2013
> New Revision: 172691
>
> URL: http://llvm.org/viewvc/llvm-project?rev=172691&view=rev
> Log:
> 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).
This fixes PR12938 - I added a test case for that particular issue in r172697.
Though it was a bit finicky about where I put the [[noreturn]].
Perhaps we can have some warnings/fixits?
Placed before the function name:
special.cpp:2:8: warning: attribute 'noreturn' ignored, because it is
not attached to a declaration [-Wignored-attributes]
void [[noreturn]] bar();
^
Placed at the end of a function declaration:
special.cpp:3:14: error: 'noreturn' attribute cannot be applied to types
void baz() [[noreturn]];
^
>
> Added:
> cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/p1.cpp
> cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp
> Modified:
> cfe/trunk/include/clang/AST/Decl.h
> cfe/trunk/include/clang/AST/Type.h
> cfe/trunk/include/clang/Basic/Attr.td
> cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> cfe/trunk/include/clang/Sema/Sema.h
> cfe/trunk/lib/AST/Decl.cpp
> cfe/trunk/lib/Analysis/CFG.cpp
> cfe/trunk/lib/CodeGen/CGCall.cpp
> cfe/trunk/lib/Parse/ParseDecl.cpp
> cfe/trunk/lib/Parse/ParseDeclCXX.cpp
> cfe/trunk/lib/Parse/Parser.cpp
> cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp
> cfe/trunk/lib/Sema/SemaDecl.cpp
> cfe/trunk/lib/Sema/SemaDeclAttr.cpp
> cfe/trunk/lib/Sema/SemaStmt.cpp
> cfe/trunk/lib/Sema/SemaType.cpp
> cfe/trunk/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
> cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp
> cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
> cfe/trunk/test/Parser/cxx0x-attributes.cpp
> cfe/trunk/test/Parser/objcxx11-attributes.mm
>
> Modified: cfe/trunk/include/clang/AST/Decl.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/AST/Decl.h (original)
> +++ cfe/trunk/include/clang/AST/Decl.h Wed Jan 16 19:30:42 2013
> @@ -1799,6 +1799,10 @@
> /// \brief Determines whether this is a global function.
> bool isGlobal() const;
>
> + /// \brief Determines whether this function is known to be 'noreturn', through
> + /// an attribute on its declaration or its type.
> + bool isNoReturn() const;
> +
> /// \brief True if the function was a definition but its body was skipped.
> bool hasSkippedBody() const { return HasSkippedBody; }
> void setHasSkippedBody(bool Skipped = true) { HasSkippedBody = Skipped; }
>
> Modified: cfe/trunk/include/clang/AST/Type.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Type.h?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/AST/Type.h (original)
> +++ cfe/trunk/include/clang/AST/Type.h Wed Jan 16 19:30:42 2013
> @@ -2706,6 +2706,9 @@
>
> bool getHasRegParm() const { return getExtInfo().getHasRegParm(); }
> unsigned getRegParmType() const { return getExtInfo().getRegParm(); }
> + /// \brief Determine whether this function type includes the GNU noreturn
> + /// attribute. The C++11 [[noreturn]] attribute does not affect the function
> + /// type.
> bool getNoReturnAttr() const { return getExtInfo().getNoReturn(); }
> CallingConv getCallConv() const { return getExtInfo().getCC(); }
> ExtInfo getExtInfo() const { return ExtInfo(FunctionTypeBits.ExtInfo); }
>
> Modified: cfe/trunk/include/clang/Basic/Attr.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Attr.td?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/Attr.td (original)
> +++ cfe/trunk/include/clang/Basic/Attr.td Wed Jan 16 19:30:42 2013
> @@ -296,6 +296,11 @@
> let Spellings = [GNU<"shared">];
> }
>
> +def CXX11NoReturn : InheritableAttr {
> + let Spellings = [CXX11<"","noreturn">, CXX11<"std","noreturn">];
> + let Subjects = [Function];
> +}
> +
> def OpenCLKernel : Attr {
> let Spellings = [GNU<"opencl_kernel_function">];
> }
> @@ -466,8 +471,7 @@
> }
>
> def NoReturn : InheritableAttr {
> - let Spellings = [GNU<"noreturn">, CXX11<"gnu", "noreturn">,
> - CXX11<"", "noreturn">, CXX11<"std", "noreturn">];
> + let Spellings = [GNU<"noreturn">, CXX11<"gnu", "noreturn">];
> // FIXME: Does GCC allow this on the function instead?
> let Subjects = [Function];
> }
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Wed Jan 16 19:30:42 2013
> @@ -501,6 +501,8 @@
> "attribute '%0' cannot have an argument list">;
> def err_cxx11_attribute_forbids_ellipsis : Error<
> "attribute '%0' cannot be used as an attribute pack">;
> +def err_cxx11_attribute_repeated : Error<
> + "attribute %0 cannot appear multiple times in an attribute specifier">;
> def err_attributes_not_allowed : Error<"an attribute list cannot appear here">;
> def err_l_square_l_square_not_attribute : Error<
> "C++11 only allows consecutive left square brackets when "
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Jan 16 19:30:42 2013
> @@ -1830,6 +1830,8 @@
> "functions, methods, and parameters|classes|variables|methods|"
> "variables, functions and labels|fields and global variables|structs|"
> "variables, functions and tag types|thread-local variables}1">;
> +def err_attribute_not_type_attr : Error<
> + "'%0' attribute cannot be applied to types">;
> def warn_function_attribute_wrong_type : Warning<
> "'%0' only applies to function types; type here is %1">,
> InGroup<IgnoredAttributes>;
> @@ -5861,6 +5863,10 @@
> InGroup<InvalidNoreturn>;
> def err_noreturn_block_has_return_expr : Error<
> "block declared 'noreturn' should not return">;
> +def err_noreturn_missing_on_first_decl : Error<
> + "function declared '[[noreturn]]' after its first declaration">;
> +def note_noreturn_missing_first_decl : Note<
> + "declaration missing '[[noreturn]]' attribute is here">;
> def err_block_on_nonlocal : Error<
> "__block attribute not allowed, only allowed on local variables">;
> def err_block_on_vm : Error<
>
> Modified: cfe/trunk/include/clang/Sema/Sema.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Sema/Sema.h (original)
> +++ cfe/trunk/include/clang/Sema/Sema.h Wed Jan 16 19:30:42 2013
> @@ -2323,9 +2323,12 @@
>
> // Decl attributes - this routine is the top level dispatcher.
> void ProcessDeclAttributes(Scope *S, Decl *D, const Declarator &PD,
> - bool NonInheritable = true, bool Inheritable = true);
> + bool NonInheritable = true,
> + bool Inheritable = true);
> void ProcessDeclAttributeList(Scope *S, Decl *D, const AttributeList *AL,
> - bool NonInheritable = true, bool Inheritable = true);
> + bool NonInheritable = true,
> + bool Inheritable = true,
> + bool IncludeCXX11Attributes = true);
> bool ProcessAccessDeclAttributeList(AccessSpecDecl *ASDecl,
> const AttributeList *AttrList);
>
>
> Modified: cfe/trunk/lib/AST/Decl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Decl.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/AST/Decl.cpp (original)
> +++ cfe/trunk/lib/AST/Decl.cpp Wed Jan 16 19:30:42 2013
> @@ -1808,6 +1808,11 @@
> return true;
> }
>
> +bool FunctionDecl::isNoReturn() const {
> + return hasAttr<NoReturnAttr>() || hasAttr<CXX11NoReturnAttr>() ||
> + getType()->getAs<FunctionType>()->getNoReturnAttr();
> +}
> +
> void
> FunctionDecl::setPreviousDeclaration(FunctionDecl *PrevDecl) {
> redeclarable_base::setPreviousDeclaration(PrevDecl);
>
> Modified: cfe/trunk/lib/Analysis/CFG.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFG.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Analysis/CFG.cpp (original)
> +++ cfe/trunk/lib/Analysis/CFG.cpp Wed Jan 16 19:30:42 2013
> @@ -807,7 +807,7 @@
> Ty = Context->getBaseElementType(Ty);
>
> const CXXDestructorDecl *Dtor = Ty->getAsCXXRecordDecl()->getDestructor();
> - if (cast<FunctionType>(Dtor->getType())->getNoReturnAttr())
> + if (Dtor->isNoReturn())
> Block = createNoReturnBlock();
> else
> autoCreateBlock();
> @@ -1402,7 +1402,7 @@
> }
>
> if (FunctionDecl *FD = C->getDirectCallee()) {
> - if (FD->hasAttr<NoReturnAttr>())
> + if (FD->isNoReturn())
> NoReturn = true;
> if (FD->hasAttr<NoThrowAttr>())
> AddEHEdge = false;
> @@ -3190,7 +3190,7 @@
> // a new block for the destructor which does not have as a successor
> // anything built thus far. Control won't flow out of this block.
> const CXXDestructorDecl *Dtor = E->getTemporary()->getDestructor();
> - if (cast<FunctionType>(Dtor->getType())->getNoReturnAttr())
> + if (Dtor->isNoReturn())
> Block = createNoReturnBlock();
> else
> autoCreateBlock();
> @@ -3327,10 +3327,8 @@
> }
>
> bool CFGImplicitDtor::isNoReturn(ASTContext &astContext) const {
> - if (const CXXDestructorDecl *decl = getDestructorDecl(astContext)) {
> - QualType ty = decl->getType();
> - return cast<FunctionType>(ty)->getNoReturnAttr();
> - }
> + if (const CXXDestructorDecl *DD = getDestructorDecl(astContext))
> + return DD->isNoReturn();
> return false;
> }
>
>
> Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGCall.cpp Wed Jan 16 19:30:42 2013
> @@ -989,7 +989,8 @@
> FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
> }
>
> - if (TargetDecl->hasAttr<NoReturnAttr>())
> + if (TargetDecl->hasAttr<NoReturnAttr>() ||
> + TargetDecl->hasAttr<CXX11NoReturnAttr>())
> FuncAttrs.addAttribute(llvm::Attribute::NoReturn);
>
> if (TargetDecl->hasAttr<ReturnsTwiceAttr>())
>
> Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseDecl.cpp Wed Jan 16 19:30:42 2013
> @@ -902,6 +902,8 @@
> ConsumeAnyToken();
>
> if (OnDefinition && !IsThreadSafetyAttribute(LA.AttrName.getName())) {
> + // FIXME: Do not warn on C++11 attributes, once we start supporting
> + // them here.
> Diag(Tok, diag::warn_attribute_on_function_definition)
> << LA.AttrName.getName();
> }
>
> Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Wed Jan 16 19:30:42 2013
> @@ -3032,7 +3032,7 @@
> 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 @@
> 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 @@
> 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") {
>
> Modified: cfe/trunk/lib/Parse/Parser.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Parse/Parser.cpp (original)
> +++ cfe/trunk/lib/Parse/Parser.cpp Wed Jan 16 19:30:42 2013
> @@ -944,7 +944,8 @@
> if (Tok.isNot(tok::equal)) {
> AttributeList *DtorAttrs = D.getAttributes();
> while (DtorAttrs) {
> - if (!IsThreadSafetyAttribute(DtorAttrs->getName()->getName())) {
> + if (!IsThreadSafetyAttribute(DtorAttrs->getName()->getName()) &&
> + !DtorAttrs->isCXX11Attribute()) {
> Diag(DtorAttrs->getLoc(), diag::warn_attribute_on_function_definition)
> << DtorAttrs->getName()->getName();
> }
>
> Modified: cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp (original)
> +++ cfe/trunk/lib/Sema/AnalysisBasedWarnings.cpp Wed Jan 16 19:30:42 2013
> @@ -329,8 +329,7 @@
>
> if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
> ReturnsVoid = FD->getResultType()->isVoidType();
> - HasNoReturn = FD->hasAttr<NoReturnAttr>() ||
> - FD->getType()->getAs<FunctionType>()->getNoReturnAttr();
> + HasNoReturn = FD->isNoReturn();
> }
> else if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D)) {
> ReturnsVoid = MD->getResultType()->isVoidType();
>
> Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed Jan 16 19:30:42 2013
> @@ -2276,6 +2276,18 @@
> }
> }
>
> + // C++11 [dcl.attr.noreturn]p1:
> + // The first declaration of a function shall specify the noreturn
> + // attribute if any declaration of that function specifies the noreturn
> + // attribute.
> + if (New->hasAttr<CXX11NoReturnAttr>() &&
> + !Old->hasAttr<CXX11NoReturnAttr>()) {
> + Diag(New->getAttr<CXX11NoReturnAttr>()->getLocation(),
> + diag::err_noreturn_missing_on_first_decl);
> + Diag(Old->getFirstDeclaration()->getLocation(),
> + diag::note_noreturn_missing_first_decl);
> + }
> +
> // (C++98 8.3.5p3):
> // All declarations for a function shall agree exactly in both the
> // return type and the parameter-type-list.
>
> Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Wed Jan 16 19:30:42 2013
> @@ -1684,6 +1684,21 @@
> D->addAttr(::new (S.Context) AnalyzerNoReturnAttr(Attr.getRange(), S.Context));
> }
>
> +static void handleCXX11NoReturnAttr(Sema &S, Decl *D,
> + const AttributeList &Attr) {
> + // C++11 [dcl.attr.noreturn]p1:
> + // The attribute may be applied to the declarator-id in a function
> + // declaration.
> + FunctionDecl *FD = dyn_cast<FunctionDecl>(D);
> + if (!FD) {
> + S.Diag(Attr.getLoc(), diag::err_attribute_wrong_decl_type)
> + << Attr.getName() << ExpectedFunctionOrMethod;
> + return;
> + }
> +
> + D->addAttr(::new (S.Context) CXX11NoReturnAttr(Attr.getRange(), S.Context));
> +}
> +
> // PS3 PPU-specific.
> static void handleVecReturnAttr(Sema &S, Decl *D, const AttributeList &Attr) {
> /*
> @@ -4272,10 +4287,10 @@
> static void ProcessInheritableDeclAttr(Sema &S, Scope *scope, Decl *D,
> const AttributeList &Attr) {
> switch (Attr.getKind()) {
> - case AttributeList::AT_IBAction: handleIBAction(S, D, Attr); break;
> - case AttributeList::AT_IBOutlet: handleIBOutlet(S, D, Attr); break;
> - case AttributeList::AT_IBOutletCollection:
> - handleIBOutletCollection(S, D, Attr); break;
> + case AttributeList::AT_IBAction: handleIBAction(S, D, Attr); break;
> + case AttributeList::AT_IBOutlet: handleIBOutlet(S, D, Attr); break;
> + case AttributeList::AT_IBOutletCollection:
> + handleIBOutletCollection(S, D, Attr); break;
> case AttributeList::AT_AddressSpace:
> case AttributeList::AT_OpenCLImageAccess:
> case AttributeList::AT_ObjCGC:
> @@ -4306,6 +4321,9 @@
> case AttributeList::AT_Common: handleCommonAttr (S, D, Attr); break;
> case AttributeList::AT_CUDAConstant:handleConstantAttr (S, D, Attr); break;
> case AttributeList::AT_Constructor: handleConstructorAttr (S, D, Attr); break;
> + case AttributeList::AT_CXX11NoReturn:
> + handleCXX11NoReturnAttr(S, D, Attr);
> + break;
> case AttributeList::AT_Deprecated:
> handleAttrWithMessage<DeprecatedAttr>(S, D, Attr, "deprecated");
> break;
> @@ -4542,11 +4560,11 @@
>
> /// ProcessDeclAttribute - Apply the specific attribute to the specified decl if
> /// the attribute applies to decls. If the attribute is a type attribute, just
> -/// silently ignore it if a GNU attribute. FIXME: Applying a C++0x attribute to
> -/// the wrong thing is illegal (C++0x [dcl.attr.grammar]/4).
> +/// silently ignore it if a GNU attribute.
> static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
> const AttributeList &Attr,
> - bool NonInheritable, bool Inheritable) {
> + bool NonInheritable, bool Inheritable,
> + bool IncludeCXX11Attributes) {
> if (Attr.isInvalid())
> return;
>
> @@ -4557,6 +4575,11 @@
> if (Attr.isMSTypespecAttribute())
> return;
>
> + // Ignore C++11 attributes on declarator chunks: they appertain to the type
> + // instead.
> + if (Attr.isCXX11Attribute() && !IncludeCXX11Attributes)
> + return;
> +
> if (NonInheritable)
> ProcessNonInheritableDeclAttr(S, scope, D, Attr);
>
> @@ -4568,10 +4591,11 @@
> /// attribute list to the specified decl, ignoring any type attributes.
> void Sema::ProcessDeclAttributeList(Scope *S, Decl *D,
> const AttributeList *AttrList,
> - bool NonInheritable, bool Inheritable) {
> - for (const AttributeList* l = AttrList; l; l = l->getNext()) {
> - ProcessDeclAttribute(*this, S, D, *l, NonInheritable, Inheritable);
> - }
> + bool NonInheritable, bool Inheritable,
> + bool IncludeCXX11Attributes) {
> + for (const AttributeList* l = AttrList; l; l = l->getNext())
> + ProcessDeclAttribute(*this, S, D, *l, NonInheritable, Inheritable,
> + IncludeCXX11Attributes);
>
> // GCC accepts
> // static int a9 __attribute__((weakref));
> @@ -4736,7 +4760,8 @@
> // when X is a decl attribute.
> for (unsigned i = 0, e = PD.getNumTypeObjects(); i != e; ++i)
> if (const AttributeList *Attrs = PD.getTypeObject(i).getAttrs())
> - ProcessDeclAttributeList(S, D, Attrs, NonInheritable, Inheritable);
> + ProcessDeclAttributeList(S, D, Attrs, NonInheritable, Inheritable,
> + /*IncludeCXX11Attributes=*/false);
>
> // Finally, apply any attributes on the decl itself.
> if (const AttributeList *Attrs = PD.getAttributes())
>
> Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaStmt.cpp Wed Jan 16 19:30:42 2013
> @@ -2419,8 +2419,7 @@
> QualType RelatedRetType;
> if (const FunctionDecl *FD = getCurFunctionDecl()) {
> FnRetType = FD->getResultType();
> - if (FD->hasAttr<NoReturnAttr>() ||
> - FD->getType()->getAs<FunctionType>()->getNoReturnAttr())
> + if (FD->isNoReturn())
> Diag(ReturnLoc, diag::warn_noreturn_function_has_return_expr)
> << FD->getDeclName();
> } else if (ObjCMethodDecl *MD = getCurMethodDecl()) {
>
> Modified: cfe/trunk/lib/Sema/SemaType.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaType.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaType.cpp Wed Jan 16 19:30:42 2013
> @@ -4189,24 +4189,43 @@
> if (attr.isInvalid())
> continue;
>
> - // [[gnu::...]] attributes are treated as declaration attributes, so may
> - // not appertain to a DeclaratorChunk, even if we handle them as type
> - // attributes.
> - // FIXME: All other C++11 type attributes may *only* appertain to a type,
> - // and should only be considered here if they appertain to a
> - // DeclaratorChunk.
> - if (attr.isCXX11Attribute() && TAL == TAL_DeclChunk &&
> - attr.getScopeName() && attr.getScopeName()->isStr("gnu")) {
> - state.getSema().Diag(attr.getLoc(),
> - diag::warn_cxx11_gnu_attribute_on_type)
> - << attr.getName();
> - continue;
> + if (attr.isCXX11Attribute()) {
> + // [[gnu::...]] attributes are treated as declaration attributes, so may
> + // not appertain to a DeclaratorChunk, even if we handle them as type
> + // attributes.
> + if (attr.getScopeName() && attr.getScopeName()->isStr("gnu")) {
> + if (TAL == TAL_DeclChunk) {
> + state.getSema().Diag(attr.getLoc(),
> + diag::warn_cxx11_gnu_attribute_on_type)
> + << attr.getName();
> + continue;
> + }
> + } else if (TAL != TAL_DeclChunk) {
> + // Otherwise, only consider type processing for a C++11 attribute if
> + // it's actually been applied to a type.
> + continue;
> + }
> }
>
> // If this is an attribute we can handle, do so now,
> // otherwise, add it to the FnAttrs list for rechaining.
> switch (attr.getKind()) {
> - default: break;
> + default:
> + // A C++11 attribute on a declarator chunk must appertain to a type.
> + if (attr.isCXX11Attribute() && TAL == TAL_DeclChunk)
> + state.getSema().Diag(attr.getLoc(), diag::err_attribute_not_type_attr)
> + << attr.getName()->getName();
> + break;
> +
> + case AttributeList::UnknownAttribute:
> + if (attr.isCXX11Attribute() && TAL == TAL_DeclChunk)
> + state.getSema().Diag(attr.getLoc(),
> + diag::warn_unknown_attribute_ignored)
> + << attr.getName();
> + break;
> +
> + case AttributeList::IgnoredAttribute:
> + break;
>
> case AttributeList::AT_MayAlias:
> // FIXME: This attribute needs to actually be handled, but if we ignore
> @@ -4255,7 +4274,7 @@
>
> case AttributeList::AT_NSReturnsRetained:
> if (!state.getSema().getLangOpts().ObjCAutoRefCount)
> - break;
> + break;
> // fallthrough into the function attrs
>
> FUNCTION_TYPE_ATTRS_CASELIST:
>
> Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp (original)
> +++ cfe/trunk/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp Wed Jan 16 19:30:42 2013
> @@ -48,7 +48,7 @@
> if (!FD)
> return;
>
> - if (FD->getAttr<AnalyzerNoReturnAttr>())
> + if (FD->getAttr<AnalyzerNoReturnAttr>() || FD->isNoReturn())
> BuildSinks = true;
> else if (const IdentifierInfo *II = FD->getIdentifier()) {
> // HACK: Some functions are not marked noreturn, and don't return.
>
> Added: cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/p1.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/p1.cpp?rev=172691&view=auto
> ==============================================================================
> --- cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/p1.cpp (added)
> +++ cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.attr.noreturn/p1.cpp Wed Jan 16 19:30:42 2013
> @@ -0,0 +1,44 @@
> +// RUN: %clang_cc1 -std=c++11 -verify -fcxx-exceptions %s
> +
> +[[noreturn]] void a() {
> + return; // expected-warning {{function 'a' declared 'noreturn' should not return}}
> +}
> +void a2 [[noreturn]] () {
> + return; // expected-warning {{function 'a2' declared 'noreturn' should not return}}
> +}
> +
> +[[noreturn, noreturn]] void b() { throw 0; } // expected-error {{attribute 'noreturn' cannot appear multiple times in an attribute specifier}}
> +[[noreturn]] [[noreturn]] void b2() { throw 0; } // ok
> +
> +[[noreturn()]] void c(); // expected-error {{attribute 'noreturn' cannot have an argument list}}
> +
> +void d() [[noreturn]]; // expected-error {{'noreturn' attribute cannot be applied to types}}
> +int d2 [[noreturn]]; // expected-error {{'noreturn' attribute only applies to functions and methods}}
> +
> +[[noreturn]] int e() { b2(); } // ok
> +
> +int f(); // expected-note {{declaration missing '[[noreturn]]' attribute is here}}
> +[[noreturn]] int f(); // expected-error {{function declared '[[noreturn]]' after its first declaration}}
> +int f();
> +
> +[[noreturn]] int g();
> +int g() { while (true) b(); } // ok
> +[[noreturn]] int g();
> +
> +[[gnu::noreturn]] int h();
> +
> +template<typename T> void test_type(T) { T::error; } // expected-error {{has no members}}
> +template<> void test_type(int (*)()) {}
> +
> +void check() {
> + // We do not consider [[noreturn]] to be part of the function's type.
> + // However, we do treat [[gnu::noreturn]] as being part of the type.
> + //
> + // This isn't quite GCC-compatible; it treats [[gnu::noreturn]] as
> + // being part of a function *pointer* type, but not being part of
> + // a function type.
> + test_type(e);
> + test_type(f);
> + test_type(g);
> + test_type(h); // expected-note {{instantiation}}
> +}
>
> Modified: cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp (original)
> +++ cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/p5.cpp Wed Jan 16 19:30:42 2013
> @@ -5,7 +5,8 @@
> void test_attributes() {
> auto nrl = [](int x) -> int { if (x > 0) return x; }; // expected-warning{{control may reach end of non-void lambda}}
>
> - auto nrl2 = []() [[noreturn]] { return; }; // expected-error{{lambda declared 'noreturn' should not return}}
> + // FIXME: GCC accepts the [[gnu::noreturn]] attribute here.
> + auto nrl2 = []() [[gnu::noreturn]] { return; }; // expected-warning{{attribute 'noreturn' ignored}}
> }
>
> template<typename T>
>
> Modified: cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp (original)
> +++ cfe/trunk/test/CXX/expr/expr.prim/expr.prim.lambda/templates.cpp Wed Jan 16 19:30:42 2013
> @@ -2,10 +2,11 @@
>
> template<typename T>
> void test_attributes() {
> - auto nrl = []() [[noreturn]] {}; // expected-error{{lambda declared 'noreturn' should not return}}
> + // FIXME: GCC accepts [[gnu::noreturn]] here.
> + auto nrl = []() [[gnu::noreturn]] {}; // expected-warning{{attribute 'noreturn' ignored}}
> }
>
> -template void test_attributes<int>(); // expected-note{{in instantiation of function}}
> +template void test_attributes<int>();
>
> template<typename T>
> void call_with_zero() {
>
> Added: cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp?rev=172691&view=auto
> ==============================================================================
> --- cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp (added)
> +++ cfe/trunk/test/CodeGenCXX/cxx11-noreturn.cpp Wed Jan 16 19:30:42 2013
> @@ -0,0 +1,8 @@
> +// RUN: %clang_cc1 -emit-llvm -std=c++11 %s -o - | FileCheck %s
> +
> +int g();
> +
> +// CHECK: _Z1fv(){{.*}} noreturn
> +[[noreturn]] int f() {
> + while (g()) {}
> +}
>
> Modified: cfe/trunk/test/Parser/cxx0x-attributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx0x-attributes.cpp?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/test/Parser/cxx0x-attributes.cpp (original)
> +++ cfe/trunk/test/Parser/cxx0x-attributes.cpp Wed Jan 16 19:30:42 2013
> @@ -210,8 +210,11 @@
>
> // Expression tests
> void bar () {
> - [] () [[noreturn]] { return; } (); // expected-error {{should not return}}
> - [] () [[noreturn]] { throw; } ();
> + // FIXME: GCC accepts [[gnu::noreturn]] on a lambda, even though it appertains
> + // to the operator()'s type, and GCC does not otherwise accept attributes
> + // applied to types. Use that to test this.
> + [] () [[gnu::noreturn]] { return; } (); // expected-warning {{attribute 'noreturn' ignored}} FIXME-error {{should not return}}
> + [] () [[gnu::noreturn]] { throw; } (); // expected-warning {{attribute 'noreturn' ignored}}
> new int[42][[]][5][[]]{};
> }
>
>
> Modified: cfe/trunk/test/Parser/objcxx11-attributes.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objcxx11-attributes.mm?rev=172691&r1=172690&r2=172691&view=diff
> ==============================================================================
> --- cfe/trunk/test/Parser/objcxx11-attributes.mm (original)
> +++ cfe/trunk/test/Parser/objcxx11-attributes.mm Wed Jan 16 19:30:42 2013
> @@ -13,12 +13,12 @@
> int a[ [noreturn getSize] ];
>
> // ... but is interpreted as an attribute where possible.
> - int b[ [noreturn] ]; // expected-warning {{'noreturn' only applies to function types}}
> + int b[ [noreturn] ]; // expected-error {{'noreturn' attribute only applies to functions and methods}}
>
> int c[ [noreturn getSize] + 1 ];
>
> // An array size which is computed by a lambda is not OK.
> - int d[ [noreturn] { return 3; } () ]; // expected-error {{expected ']'}} expected-warning {{'noreturn' only applies}}
> + int d[ [noreturn] { return 3; } () ]; // expected-error {{expected ']'}} expected-error {{'noreturn' attribute only applies}}
>
> // A message send which contains a message send is OK.
> [ [ X alloc ] init ];
> @@ -40,7 +40,7 @@
> expected-warning {{unknown attribute 'bitand' ignored}}
>
> // FIXME: Suppress vexing parse warning
> - [[noreturn]]int(e)(); // expected-warning {{function declaration}} expected-note {{replace parentheses with an initializer}}
> + [[gnu::noreturn]]int(e)(); // expected-warning {{function declaration}} expected-note {{replace parentheses with an initializer}}
> int e2(); // expected-warning {{interpreted as a function declaration}} expected-note{{}}
>
> // A function taking a noreturn function.
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list