loplugin:useuniqueptr expand search for ranged-loop-delete

Change-Id: I78955f4db9b4da2858dfb25e69a5502eb0280418

1 files changed, 5 insertions, 1 deletions

diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx
index c14d5fc5a57b..24992685df43 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -256,7 +256,11 @@ void UseUniquePtr::CheckForRangedLoopDelete(const CXXDestructorDecl* destructorD
         auto cxxForRangeStmt = dyn_cast<CXXForRangeStmt>(*i);
         if (!cxxForRangeStmt)
             continue;
-        auto deleteExpr = dyn_cast<CXXDeleteExpr>(cxxForRangeStmt->getBody());
+        CXXDeleteExpr const * deleteExpr = nullptr;
+        if (auto compoundStmt = dyn_cast<CompoundStmt>(cxxForRangeStmt->getBody()))
+            deleteExpr = dyn_cast<CXXDeleteExpr>(*compoundStmt->body_begin());
+        else
+            deleteExpr = dyn_cast<CXXDeleteExpr>(cxxForRangeStmt->getBody());
         if (!deleteExpr)
             continue;
         auto memberExpr = dyn_cast<MemberExpr>(cxxForRangeStmt->getRangeInit());