Fixed bug in CFG construction where we failed to handle loop bodies with

no statements (or just full of ';' statements).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41620 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/AST/CFG.cpp b/AST/CFG.cpp
index f6b74e7f7b7580b0b60aba2eae5cef9cfd930d85..a2ce8a283b6facb0a48431fde3d900b9ceb76fa1 100644 (file)
--- a/AST/CFG.cpp
+++ b/AST/CFG.cpp
@@ -213,7 +213,7 @@ void CFGBuilder::FinishBlock(CFGBlock* B) {
 ///  of the created blocks, or the original value of "Block" when this method
 ///  was called if no additional blocks are created.
 CFGBlock* CFGBuilder::addStmt(Stmt* S) {
-  assert (Block);
+  if (!Block) Block = createBlock();
   return WalkAST(S,true);
 }
 
@@ -555,8 +555,8 @@ CFGBlock* CFGBuilder::VisitForStmt(ForStmt* F) {
     // All breaks should go to the code following the loop.
     BreakTargetBlock = LoopSuccessor;
     
-    // Create a new block to contain the (bottom) of the loop body.      
-    Block = createBlock();
+    // Create a new block to contain the (bottom) of the loop body.
+    Block = NULL;
     
     // If we have increment code, insert it at the end of the body block.
     if (Stmt* I = F->getInc()) Block = addStmt(I);
@@ -564,8 +564,11 @@ CFGBlock* CFGBuilder::VisitForStmt(ForStmt* F) {
     // Now populate the body block, and in the process create new blocks
     // as we walk the body of the loop.
     CFGBlock* BodyBlock = Visit(F->getBody());      
-    assert (BodyBlock);      
-    if (Block) FinishBlock(BodyBlock);
+
+    if (!BodyBlock)
+      BodyBlock = ExitConditionBlock; // can happen for "for (...;...; ) ;"
+    else if (Block)
+      FinishBlock(BodyBlock);
     
     // This new body block is a successor to our "exit" condition block.
     ExitConditionBlock->addSuccessor(BodyBlock);
@@ -644,8 +647,11 @@ CFGBlock* CFGBuilder::VisitWhileStmt(WhileStmt* W) {
     
     // Create the body.  The returned block is the entry to the loop body.
     CFGBlock* BodyBlock = Visit(W->getBody());
-    assert (BodyBlock);
-    if (Block) FinishBlock(BodyBlock);
+    
+    if (!BodyBlock)
+      BodyBlock = ExitConditionBlock; // can happen for "while(...) ;"
+    else if (Block)
+      FinishBlock(BodyBlock);
     
     // Add the loop body entry as a successor to the condition.
     ExitConditionBlock->addSuccessor(BodyBlock);
@@ -719,9 +725,12 @@ CFGBlock* CFGBuilder::VisitDoStmt(DoStmt* D) {
     
     // Create the body.  The returned block is the entry to the loop body.
     BodyBlock = Visit(D->getBody());
-    assert (BodyBlock);
-    if (Block) FinishBlock(BodyBlock);
     
+    if (!BodyBlock)
+      BodyBlock = ExitConditionBlock; // can happen for "do ; while(...)"
+    else if (Block)
+      FinishBlock(BodyBlock);
+        
     // Add the loop body entry as a successor to the condition.
     ExitConditionBlock->addSuccessor(BodyBlock);
   }