1 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index cfdee4927bb..fcdc95ec53d 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -1188,8 +1188,21 @@ CFGBlock* CFGBuilder::VisitWhileStmt(WhileStmt* W) {
   // to this block.  NULL out Block to force lazy creation of another block.
   Block = NULL;
 
-  // Return the condition block, which is the dominating block for the loop.
+  // Set Succ to be the condition block, which is the dominating block
+  // for the loop.
   Succ = EntryConditionBlock;
+  
+  // Finally, if the WhileStmt contains a condition variable, add both the 
+  // WhileStmt and the condition variable initialization to the CFG.
+  if (VarDecl *VD = W->getConditionVariable()) {
+    if (Expr *Init = VD->getInit()) {
+      autoCreateBlock();
+      AppendStmt(Block, W, AddStmtChoice::AlwaysAdd);
+      Succ = addStmt(Init);
+      return Succ;
+    }
+  }
+  
   return EntryConditionBlock;
 }