diff options
| -rw-r--r-- | compilerplugins/clang/test/useuniqueptr.cxx | 10 | ||||
| -rw-r--r-- | compilerplugins/clang/useuniqueptr.cxx | 13 |
2 files changed, 21 insertions, 2 deletions
diff --git a/compilerplugins/clang/test/useuniqueptr.cxx b/compilerplugins/clang/test/useuniqueptr.cxx index a68cea3201d0..8ef71175bb99 100644 --- a/compilerplugins/clang/test/useuniqueptr.cxx +++ b/compilerplugins/clang/test/useuniqueptr.cxx @@ -162,4 +162,14 @@ class Foo13 { DELETEZ(m_pbar2); // expected-error {{unconditional call to delete on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}} } }; +// check for unconditional inner compound statements +class Foo14 { + int * m_pbar1; // expected-note {{member is here [loplugin:useuniqueptr]}} + ~Foo14() + { + { + delete m_pbar1; // expected-error {{unconditional call to delete on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}} + } + } +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx index 0aab2a644bfb..ce09b5873cbb 100644 --- a/compilerplugins/clang/useuniqueptr.cxx +++ b/compilerplugins/clang/useuniqueptr.cxx @@ -52,6 +52,7 @@ public: bool VisitCXXMethodDecl(const CXXMethodDecl* ); bool VisitCompoundStmt(const CompoundStmt* ); private: + void CheckCompoundStmt(const CXXMethodDecl*, const CompoundStmt* ); void CheckForUnconditionalDelete(const CXXMethodDecl*, const CompoundStmt* ); void CheckForSimpleDelete(const CXXMethodDecl*, const CompoundStmt* ); void CheckRangedLoopDelete(const CXXMethodDecl*, const CXXForRangeStmt* ); @@ -74,6 +75,13 @@ bool UseUniquePtr::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) if (!compoundStmt || compoundStmt->size() == 0) return true; + CheckCompoundStmt(methodDecl, compoundStmt); + + return true; +} + +void UseUniquePtr::CheckCompoundStmt(const CXXMethodDecl* methodDecl, const CompoundStmt* compoundStmt) +{ CheckForSimpleDelete(methodDecl, compoundStmt); for (auto i = compoundStmt->body_begin(); i != compoundStmt->body_end(); ++i) @@ -84,9 +92,10 @@ bool UseUniquePtr::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) CheckLoopDelete(methodDecl, forStmt->getBody()); else if (auto whileStmt = dyn_cast<WhileStmt>(*i)) CheckLoopDelete(methodDecl, whileStmt->getBody()); + // check for unconditional inner compound statements + else if (auto innerCompoundStmt = dyn_cast<CompoundStmt>(*i)) + CheckCompoundStmt(methodDecl, innerCompoundStmt); } - - return true; } /** |