don't check next statement after if body if there's also an else part

Change-Id: I04265acd821187f529562691f35ede93b84368fa

1 files changed, 7 insertions, 2 deletions

diff --git a/compilerplugins/clang/bodynotinblock.cxx b/compilerplugins/clang/bodynotinblock.cxx
index 9c047c501fca..f13eb9392357 100644
--- a/compilerplugins/clang/bodynotinblock.cxx
+++ b/compilerplugins/clang/bodynotinblock.cxx
@@ -54,7 +54,7 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt, StmtParents& parents )
             parents.push_back( *it );
             if( const IfStmt* ifstmt = dyn_cast< IfStmt >( *it ))
                 {
-                checkBody( ifstmt->getThen(), parents, 0 );
+                checkBody( ifstmt->getThen(), parents, 0, ifstmt->getElse() != NULL );
                 checkBody( ifstmt->getElse(), parents, 0 );
                 }
             else if( const WhileStmt* whilestmt = dyn_cast< WhileStmt >( *it ))
@@ -70,7 +70,7 @@ void BodyNotInBlock::traverseStatement( const Stmt* stmt, StmtParents& parents )
     parents.pop_back();
     }
 
-void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, int stmtType )
+void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, int stmtType, bool dontGoUp )
     {
     if( body == NULL || parents.size() < 2 )
         return;
@@ -127,6 +127,11 @@ void BodyNotInBlock::checkBody( const Stmt* body, const StmtParents& parents, in
         // make it visible the two statements are not in the same body.
         if( dyn_cast< CompoundStmt >( parents[ parent_pos ] ))
             return;
+        // If the body to be checked is a body of an if statement that has also
+        // an else part, don't go up, the else is after the body and should make
+        // it clear the body does not continue there.
+        if( dontGoUp )
+            return;
         }
     }