From: Ted Kremenek <kremenek@apple.com>
Date: Wed, 15 Sep 2010 07:01:20 +0000 (+0000)
Subject: Relax assertion in CFG builder when processing ForStmts.  This fixes an assertion... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f3b834471b158d65d490e3458fa16ba659ec105;p=clang

Relax assertion in CFG builder when processing ForStmts.  This fixes an assertion failure
on code containing GNU statement expressions reported in PR 8141.

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

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index e297ec4856..cc3a388862 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -991,7 +991,8 @@ CFGBlock* CFGBuilder::VisitForStmt(ForStmt* F) {
   if (Stmt* C = F->getCond()) {
     Block = ExitConditionBlock;
     EntryConditionBlock = addStmt(C);
-    assert(Block == EntryConditionBlock);
+    assert(Block == EntryConditionBlock ||
+           (Block == 0 && EntryConditionBlock == Succ));
 
     // If this block contains a condition variable, add both the condition
     // variable and initializer to the CFG.
diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m
index a44eb0c18d..bb70c90e6a 100644
--- a/test/Analysis/misc-ps.m
+++ b/test/Analysis/misc-ps.m
@@ -1129,3 +1129,9 @@ void rdar6351970_c() {
 }
 @end
 
+// PR 8149 - GNU statement expression in condition of ForStmt.
+// This previously triggered an assertion failure in CFGBuilder.
+void pr8149(void) {
+  for (; ({ do { } while (0); 0; });) { }
+}
+