malcolm.parsons created this revision. malcolm.parsons added reviewers: aaron.ballman, alexfh, mgehre. malcolm.parsons added a subscriber: cfe-commits. Herald added a subscriber: nemanjai.
Empty/incomplete variables/members/bases don't need to be initialized https://reviews.llvm.org/D25238 Files: clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp Index: test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp =================================================================== --- test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp +++ test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp @@ -423,3 +423,30 @@ // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: constructor does not initialize these fields: F UNINITIALIZED_FIELD_IN_MACRO_BODY_VIRTUAL(G); // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: constructor does not initialize these fields: G + +struct NegativeEmpty { +}; + +static void NegativeEmptyVar() { + NegativeEmpty e; + (void)e; +} + +struct NegativeEmptyMember { + NegativeEmptyMember() {} + NegativeEmpty e; +}; + +struct NegativeEmptyBase : NegativeEmpty { + NegativeEmptyBase() {} +}; + +struct NegativeEmptyArrayMember { + NegativeEmptyArrayMember() {} + char e[0]; +}; + +struct NegativeIncompleteArrayMember { + NegativeIncompleteArrayMember() {} + char e[]; +}; Index: clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp =================================================================== --- clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp +++ clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp @@ -317,6 +317,28 @@ Options.store(Opts, "IgnoreArrays", IgnoreArrays); } +// copied from clang/lib/Sema/SemaDeclCXX.cpp +static bool isIncompleteOrZeroLengthArrayType(ASTContext &Context, QualType T) { + if (T->isIncompleteArrayType()) + return true; + + while (const ConstantArrayType *ArrayT = Context.getAsConstantArrayType(T)) { + if (!ArrayT->getSize()) + return true; + + T = ArrayT->getElementType(); + } + + return false; +} + +static bool isEmpty(ASTContext &Context, const QualType &Type) { + if (const CXXRecordDecl *ClassDecl = Type->getAsCXXRecordDecl()) { + return ClassDecl->isEmpty(); + } + return isIncompleteOrZeroLengthArrayType(Context, Type); +} + void ProTypeMemberInitCheck::checkMissingMemberInitializer( ASTContext &Context, const CXXRecordDecl &ClassDecl, const CXXConstructorDecl *Ctor) { @@ -330,7 +352,8 @@ forEachField(ClassDecl, ClassDecl.fields(), false, [&](const FieldDecl *F) { if (!F->hasInClassInitializer() && utils::type_traits::isTriviallyDefaultConstructible(F->getType(), - Context)) + Context) && + !isEmpty(Context, F->getType())) FieldsToInit.insert(F); }); if (FieldsToInit.empty())
Index: test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp =================================================================== --- test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp +++ test/clang-tidy/cppcoreguidelines-pro-type-member-init.cpp @@ -423,3 +423,30 @@ // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: constructor does not initialize these fields: F UNINITIALIZED_FIELD_IN_MACRO_BODY_VIRTUAL(G); // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: constructor does not initialize these fields: G + +struct NegativeEmpty { +}; + +static void NegativeEmptyVar() { + NegativeEmpty e; + (void)e; +} + +struct NegativeEmptyMember { + NegativeEmptyMember() {} + NegativeEmpty e; +}; + +struct NegativeEmptyBase : NegativeEmpty { + NegativeEmptyBase() {} +}; + +struct NegativeEmptyArrayMember { + NegativeEmptyArrayMember() {} + char e[0]; +}; + +struct NegativeIncompleteArrayMember { + NegativeIncompleteArrayMember() {} + char e[]; +}; Index: clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp =================================================================== --- clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp +++ clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp @@ -317,6 +317,28 @@ Options.store(Opts, "IgnoreArrays", IgnoreArrays); } +// copied from clang/lib/Sema/SemaDeclCXX.cpp +static bool isIncompleteOrZeroLengthArrayType(ASTContext &Context, QualType T) { + if (T->isIncompleteArrayType()) + return true; + + while (const ConstantArrayType *ArrayT = Context.getAsConstantArrayType(T)) { + if (!ArrayT->getSize()) + return true; + + T = ArrayT->getElementType(); + } + + return false; +} + +static bool isEmpty(ASTContext &Context, const QualType &Type) { + if (const CXXRecordDecl *ClassDecl = Type->getAsCXXRecordDecl()) { + return ClassDecl->isEmpty(); + } + return isIncompleteOrZeroLengthArrayType(Context, Type); +} + void ProTypeMemberInitCheck::checkMissingMemberInitializer( ASTContext &Context, const CXXRecordDecl &ClassDecl, const CXXConstructorDecl *Ctor) { @@ -330,7 +352,8 @@ forEachField(ClassDecl, ClassDecl.fields(), false, [&](const FieldDecl *F) { if (!F->hasInClassInitializer() && utils::type_traits::isTriviallyDefaultConstructible(F->getType(), - Context)) + Context) && + !isEmpty(Context, F->getType())) FieldsToInit.insert(F); }); if (FieldsToInit.empty())
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits