Index: include/clang/Basic/Attr.td =================================================================== --- include/clang/Basic/Attr.td +++ include/clang/Basic/Attr.td @@ -90,6 +90,11 @@ [{!S->isBitField()}], "non-bit-field non-static data members">; +def NonStaticNonConstCXXMethod + : SubsetSubjectisStatic() && !S->isConst()}], + "non-static non-const member functions">; + def ObjCInstanceMethod : SubsetSubjectisInstanceMethod()}], "Objective-C instance methods">; @@ -2935,3 +2940,9 @@ let Subjects = SubjectList<[Var, Function, CXXRecord]>; let Documentation = [InternalLinkageDocs]; } + +def Reinitializes : InheritableAttr { + let Spellings = [Clang<"reinitializes", 0>]; + let Subjects = SubjectList<[NonStaticNonConstCXXMethod], ErrorDiag>; + let Documentation = [ReinitializesDocs]; +} Index: include/clang/Basic/AttrDocs.td =================================================================== --- include/clang/Basic/AttrDocs.td +++ include/clang/Basic/AttrDocs.td @@ -3419,3 +3419,31 @@ corresponding line within the inlined callee. }]; } + +def ReinitializesDocs : Documentation { + let Category = DocCatFunction; + let Content = [{ +The ``reinitializes`` attribute can be applied to a non-static, non-const C++ +member function to indicate that this member function reinitializes the entire +object to a known state, independent of the previous state of the object. + +This attribute can be interpreted by static analyzers that warn about uses of an +object that has been left in an indeterminate state by a move operation. If a +member function marked with the ``reinitializes`` attribute is called on a +moved-from object, the analyzer can conclude that the object is no longer in an +indeterminate state. + +A typical example where this attribute would be used is on functions that clear +a container class: + +.. code-block:: c++ + + template + class Container { + public: + ... + [[clang::reinitializes]] void Clear(); + ... + }; + }]; +} Index: lib/Sema/SemaDeclAttr.cpp =================================================================== --- lib/Sema/SemaDeclAttr.cpp +++ lib/Sema/SemaDeclAttr.cpp @@ -6539,6 +6539,11 @@ case ParsedAttr::AT_XRayLogArgs: handleXRayLogArgsAttr(S, D, AL); break; + + // Move semantics attribute. + case ParsedAttr::AT_Reinitializes: + handleSimpleAttribute(S, D, AL); + break; } } Index: test/SemaCXX/attr-reinitializes.cpp =================================================================== --- /dev/null +++ test/SemaCXX/attr-reinitializes.cpp @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s + +[[clang::reinitializes]] int a; // expected-error {{'reinitializes' attribute only applies to non-static non-const member functions}} + +[[clang::reinitializes]] void f(); // expected-error {{only applies to}} + +struct A { + [[clang::reinitializes]] void foo(); + __attribute__((reinitializes)) void gnu_foo(); + [[clang::reinitializes]] void bar() const; // expected-error {{only applies to}} + [[clang::reinitializes]] static void baz(); // expected-error {{only applies to}} + [[clang::reinitializes]] int a; // expected-error {{only applies to}} + + [[clang::reinitializes("arg")]] void qux(); // expected-error {{'reinitializes' attribute takes no arguments}} +};