From cf40ba82843faf215891e46de1a8eb092ea9d693 Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Thu, 9 Aug 2018 19:03:12 +0000 Subject: [analyzer] Fix the bug in UninitializedObjectChecker caused by not handling block pointers Differential Revision: https://reviews.llvm.org/D50523 llvm-svn: 339369 --- .../Checkers/UninitializedObjectChecker.cpp | 5 +++-- clang/test/Analysis/objcpp-uninitialized-object.mm | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 clang/test/Analysis/objcpp-uninitialized-object.mm (limited to 'clang') diff --git a/clang/lib/StaticAnalyzer/Checkers/UninitializedObjectChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/UninitializedObjectChecker.cpp index 6aead3f676e..7dee35e2946 100644 --- a/clang/lib/StaticAnalyzer/Checkers/UninitializedObjectChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/UninitializedObjectChecker.cpp @@ -417,7 +417,7 @@ bool FindUninitializedFields::isNonUnionUninit(const TypedValueRegion *R, continue; } - if (T->isPointerType() || T->isReferenceType()) { + if (T->isPointerType() || T->isReferenceType() || T->isBlockPointerType()) { if (isPointerOrReferenceUninit(FR, LocalChain)) ContainsUninitField = true; continue; @@ -478,7 +478,8 @@ bool FindUninitializedFields::isPointerOrReferenceUninit( const FieldRegion *FR, FieldChainInfo LocalChain) { assert((FR->getDecl()->getType()->isPointerType() || - FR->getDecl()->getType()->isReferenceType()) && + FR->getDecl()->getType()->isReferenceType() || + FR->getDecl()->getType()->isBlockPointerType()) && "This method only checks pointer/reference objects!"); SVal V = State->getSVal(FR); diff --git a/clang/test/Analysis/objcpp-uninitialized-object.mm b/clang/test/Analysis/objcpp-uninitialized-object.mm new file mode 100644 index 00000000000..7f2177e5791 --- /dev/null +++ b/clang/test/Analysis/objcpp-uninitialized-object.mm @@ -0,0 +1,22 @@ +// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.cplusplus.UninitializedObject -std=c++11 -fblocks -verify %s + +typedef void (^myBlock) (); + +struct StructWithBlock { + int a; + myBlock z; // expected-note{{uninitialized field 'this->z'}} + + StructWithBlock() : a(0), z(^{}) {} + + // Miss initialization of field `z`. + StructWithBlock(int pA) : a(pA) {} // expected-warning{{1 uninitialized field at the end of the constructor call}} + +}; + +void warnOnUninitializedBlock() { + StructWithBlock a(10); +} + +void noWarningWhenInitialized() { + StructWithBlock a; +} -- cgit v1.2.3