[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
george.karpenkov added a comment. Also loops created with gotos should also be supported (e.g. by finding backedges), but that could be done in a different patch. https://reviews.llvm.org/D41150 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
george.karpenkov added a comment. I would prefer a more detailed CFG element with more meta-information about nested loop, but this is a good starting point. https://reviews.llvm.org/D41150 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
szepet added a comment. Herald added a reviewer: george.karpenkov. ping https://reviews.llvm.org/D41150 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
szepet updated this revision to Diff 130505.
szepet added a comment.
> I essentially have one question at a glance - for loop counter variables,
> don't we want LoopEntrance be before the initialization?
I guess this would just make too much sense. Done that.
Additionally, handle the cases when we just hop to the body of the loop via
goto stmt.
Now the patches can be applied without any conflict (added the loopexit patch
as a dependency).
https://reviews.llvm.org/D41150
Files:
include/clang/Analysis/CFG.h
lib/Analysis/CFG.cpp
lib/StaticAnalyzer/Core/PathDiagnostic.cpp
test/Analysis/loopexit-cfg-output.cpp
Index: test/Analysis/loopexit-cfg-output.cpp
===
--- test/Analysis/loopexit-cfg-output.cpp
+++ test/Analysis/loopexit-cfg-output.cpp
@@ -32,8 +32,9 @@
// CHECK-NEXT: Succs (2): B3 B1
// CHECK: [B5]
-// CHECK-NEXT: 1: 0
-// CHECK-NEXT: 2: int i = 0;
+// CHECK-NEXT: 1: ForStmt (LoopEntrance)
+// CHECK-NEXT: 2: 0
+// CHECK-NEXT: 3: int i = 0;
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B4
@@ -46,8 +47,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
@@ -62,15 +63,20 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): B2 NULL
+// CHECK: [B4]
+// CHECK-NEXT: 1: ForStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_forloop2() {
for (;;)
;
}
-// CHECK: [B5 (ENTRY)]
-// CHECK-NEXT: Succs (1): B4
+// CHECK: [B6 (ENTRY)]
+// CHECK-NEXT: Succs (1): B5
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -91,6 +97,11 @@
// CHECK-NEXT: Preds (2): B2 B5
// CHECK-NEXT: Succs (2): B3 NULL
+// CHECK: [B5]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B6
+// CHECK-NEXT: Succs (1): B4
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while1() {
@@ -125,6 +136,7 @@
// CHECK: [B4]
// CHECK-NEXT: 1: int l;
+// CHECK-NEXT: 2: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B5
// CHECK-NEXT: Succs (1): B3
@@ -138,8 +150,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -155,16 +167,21 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): NULL B1
+// CHECK: [B4]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while3() {
while (false) {
;
}
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B2
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -180,6 +197,11 @@
// CHECK: [B3]
// CHECK-NEXT: Succs (1): B2
+// CHECK: [B4]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B2
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_dowhile1() {
@@ -221,6 +243,7 @@
// CHECK: [B5]
// CHECK-NEXT: 1: 2
// CHECK-NEXT: 2: int j = 2;
+// CHECK-NEXT: 3: DoStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B3
@@ -274,8 +297,9 @@
// CHECK-NEXT: Succs (2): B5 B3
// CHECK: [B7]
-// CHECK-NEXT: 1: 1
-// CHECK-NEXT: 2: int j = 1;
+// CHECK-NEXT: 1: ForStmt (LoopEntrance)
+// CHECK-NEXT: 2: 1
+// CHECK-NEXT: 3: int j = 1;
// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B6
@@ -292,6 +316,7 @@
// CHECK-NEXT: 1: 40
// CHECK-NEXT: 2: -[B9.1]
// CHECK-NEXT: 3: int i = -40;
+// CHECK-NEXT: 4: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B10
// CHECK-NEXT: Succs (1): B8
@@ -305,19 +330,19 @@
}
}
-// CHECK: [B9 (ENTRY)]
-// CHECK-NEXT: Succs (1): B8
+// CHECK: [B10 (ENTRY)]
+// CHECK-NEXT: Succs (1): B9
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
-// CHECK-NEXT: Preds (1): B7
+// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B0
// CHECK: [B2]
// CHECK-NEXT: 1: j
// CHECK-NEXT: 2: [B2.1]++
// CHECK-NEXT: Preds (1): B3
-// CHECK-NEXT: Succs (1): B7
+// CHECK-NEXT: Succs (1): B8
// CHECK: [B3]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -346,22 +371,28 @@
// CHECK-NEXT: Succs (1): B5
// CHECK: [B7]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B8
+// CHECK-NEXT: Succs (1): B5
+
+// CHECK: [B8]
// CHECK-NEXT: 1: j
-// CHECK-NEXT: 2: [B7.1] (ImplicitCastExpr, LValueToRValue,
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
NoQ added a comment. (edited my comment: fixed the suggested change to mention the right block) https://reviews.llvm.org/D41150 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
NoQ added a comment.
Because it wasn't immediately obvious to me how to apply both this patch and
https://reviews.llvm.org/D39398 (there are a couple of minor conflicts between
them), i wanted to post a few pictures for the reference, because
`debug.ViewCFG` graphs are much easier to comprehend than text dumps.
For example, here's the new CFG for `check_return()` in
`loopexit-cfg-output.cpp`:
833 int check_return() {
834 for (int i = 0; i < 10; i++) {
835 int j = 1;
836 while (j < 12) {
837 if (j % 2)
838 return 0;
839 }
840 }
841 return 1;
842 }
F5732587: Screen Shot 2018-01-02 at 3.42.17 PM.png
I essentially have one question at a glance - for loop counter variables, don't
we want `LoopEntrance` be before the initialization? I.e. on this picture
wouldn't it be better to have
[B8]
1: WhileStmt (LoopEntrance)
2: 1
3: int j = 1;
?
Because otherwise our future `LoopContext` wouldn't correspond to any
variable's lifetime scope, so it'd be kind of useless as a `ScopeContext`.
Because, as far as i understand, there are two scopes in every loop:
1. The scope of the whole loop which includes the counter,
2. The scope of every iteration, which goes out of scope after the iteration
ends.
And currently `LoopContext` is none of these. Would loop unrolling still work
in a sensible manner if we move `LoopEntrance` to the beginning of the block?
https://reviews.llvm.org/D41150
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
szepet updated this revision to Diff 127894.
szepet marked an inline comment as done.
szepet added a comment.
Comment added to LoopEntrance CFGElement.
https://reviews.llvm.org/D41150
Files:
include/clang/Analysis/CFG.h
lib/Analysis/CFG.cpp
lib/StaticAnalyzer/Core/PathDiagnostic.cpp
test/Analysis/loopexit-cfg-output.cpp
Index: test/Analysis/loopexit-cfg-output.cpp
===
--- test/Analysis/loopexit-cfg-output.cpp
+++ test/Analysis/loopexit-cfg-output.cpp
@@ -34,6 +34,7 @@
// CHECK: [B5]
// CHECK-NEXT: 1: 0
// CHECK-NEXT: 2: int i = 0;
+// CHECK-NEXT: 3: ForStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B4
@@ -46,8 +47,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
@@ -62,15 +63,20 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): B2 NULL
+// CHECK: [B4]
+// CHECK-NEXT: 1: ForStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_forloop2() {
for (;;)
;
}
-// CHECK: [B5 (ENTRY)]
-// CHECK-NEXT: Succs (1): B4
+// CHECK: [B6 (ENTRY)]
+// CHECK-NEXT: Succs (1): B5
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -91,6 +97,11 @@
// CHECK-NEXT: Preds (2): B2 B5
// CHECK-NEXT: Succs (2): B3 NULL
+// CHECK: [B5]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B6
+// CHECK-NEXT: Succs (1): B4
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while1() {
@@ -125,6 +136,7 @@
// CHECK: [B4]
// CHECK-NEXT: 1: int l;
+// CHECK-NEXT: 2: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B5
// CHECK-NEXT: Succs (1): B3
@@ -138,8 +150,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -155,16 +167,21 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): NULL B1
+// CHECK: [B4]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while3() {
while (false) {
;
}
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B2
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -180,6 +197,11 @@
// CHECK: [B3]
// CHECK-NEXT: Succs (1): B2
+// CHECK: [B4]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B2
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_dowhile1() {
@@ -221,6 +243,7 @@
// CHECK: [B5]
// CHECK-NEXT: 1: 2
// CHECK-NEXT: 2: int j = 2;
+// CHECK-NEXT: 3: DoStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B3
@@ -276,6 +299,7 @@
// CHECK: [B7]
// CHECK-NEXT: 1: 1
// CHECK-NEXT: 2: int j = 1;
+// CHECK-NEXT: 3: ForStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B6
@@ -292,6 +316,7 @@
// CHECK-NEXT: 1: 40
// CHECK-NEXT: 2: -[B9.1]
// CHECK-NEXT: 3: int i = -40;
+// CHECK-NEXT: 4: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B10
// CHECK-NEXT: Succs (1): B8
@@ -305,19 +330,19 @@
}
}
-// CHECK: [B9 (ENTRY)]
-// CHECK-NEXT: Succs (1): B8
+// CHECK: [B10 (ENTRY)]
+// CHECK-NEXT: Succs (1): B9
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
-// CHECK-NEXT: Preds (1): B7
+// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B0
// CHECK: [B2]
// CHECK-NEXT: 1: j
// CHECK-NEXT: 2: [B2.1]++
// CHECK-NEXT: Preds (1): B3
-// CHECK-NEXT: Succs (1): B7
+// CHECK-NEXT: Succs (1): B8
// CHECK: [B3]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -346,22 +371,28 @@
// CHECK-NEXT: Succs (1): B5
// CHECK: [B7]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B8
+// CHECK-NEXT: Succs (1): B5
+
+// CHECK: [B8]
// CHECK-NEXT: 1: j
-// CHECK-NEXT: 2: [B7.1] (ImplicitCastExpr, LValueToRValue, int)
+// CHECK-NEXT: 2: [B8.1] (ImplicitCastExpr, LValueToRValue, int)
// CHECK-NEXT: 3: 6
-// CHECK-NEXT: 4: [B7.2] < [B7.3]
-// CHECK-NEXT: T: for (...; [B7.4]; ...)
-// CHECK-NEXT: Preds (2): B2 B8
-// CHECK-NEXT: Succs (2): B5 B1
+// CHECK-NEXT: 4: [B8.2] < [B8.3]
+// CHECK-NEXT: T: for (...; [B8.4]; ...)
+// CHECK-NEXT: Preds (2): B2 B9
+// CHECK-NEXT: Succs (2): B7 B1
-// CHECK: [B8]
+// CHECK: [B9]
// CHECK-NEXT: 1: 40
-//
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
dkrupp added inline comments.
Comment at: include/clang/Analysis/CFG.h:179
/// entered.
+class CFGLoopEntrance : public CFGElement {
+public:
This comment refers to the CFGLoopExit class. Please add a separate explaining
comment to the CFGLoopEntrance.
https://reviews.llvm.org/D41150
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D41150: [CFG] Adding new CFGStmt LoopEntrance for the StaticAnalyzer
szepet created this revision.
szepet added reviewers: dcoughlin, zaks.anna, NoQ, rsmith.
Herald added subscribers: dkrupp, a.sidorin, baloghadamsoftware, whisperity.
Adding LoopEntrance as a new CFGElement to the CFG.
This element is added as the last element of the CFGBlock just before the loop
condition block.
This can help the Static Analyzer to have a more precise loop modeling.
https://reviews.llvm.org/D41150
Files:
include/clang/Analysis/CFG.h
lib/Analysis/CFG.cpp
test/Analysis/loopexit-cfg-output.cpp
Index: test/Analysis/loopexit-cfg-output.cpp
===
--- test/Analysis/loopexit-cfg-output.cpp
+++ test/Analysis/loopexit-cfg-output.cpp
@@ -34,6 +34,7 @@
// CHECK: [B5]
// CHECK-NEXT: 1: 0
// CHECK-NEXT: 2: int i = 0;
+// CHECK-NEXT: 3: ForStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B4
@@ -46,8 +47,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
@@ -62,15 +63,20 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): B2 NULL
+// CHECK: [B4]
+// CHECK-NEXT: 1: ForStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_forloop2() {
for (;;)
;
}
-// CHECK: [B5 (ENTRY)]
-// CHECK-NEXT: Succs (1): B4
+// CHECK: [B6 (ENTRY)]
+// CHECK-NEXT: Succs (1): B5
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -91,6 +97,11 @@
// CHECK-NEXT: Preds (2): B2 B5
// CHECK-NEXT: Succs (2): B3 NULL
+// CHECK: [B5]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B6
+// CHECK-NEXT: Succs (1): B4
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while1() {
@@ -125,6 +136,7 @@
// CHECK: [B4]
// CHECK-NEXT: 1: int l;
+// CHECK-NEXT: 2: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B5
// CHECK-NEXT: Succs (1): B3
@@ -138,8 +150,8 @@
return;
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B3
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: WhileStmt (LoopExit)
@@ -155,16 +167,21 @@
// CHECK-NEXT: Preds (2): B2 B4
// CHECK-NEXT: Succs (2): NULL B1
+// CHECK: [B4]
+// CHECK-NEXT: 1: WhileStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B3
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_while3() {
while (false) {
;
}
}
-// CHECK: [B4 (ENTRY)]
-// CHECK-NEXT: Succs (1): B2
+// CHECK: [B5 (ENTRY)]
+// CHECK-NEXT: Succs (1): B4
// CHECK: [B1]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -180,6 +197,11 @@
// CHECK: [B3]
// CHECK-NEXT: Succs (1): B2
+// CHECK: [B4]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B5
+// CHECK-NEXT: Succs (1): B2
+
// CHECK: [B0 (EXIT)]
// CHECK-NEXT: Preds (1): B1
void check_dowhile1() {
@@ -221,6 +243,7 @@
// CHECK: [B5]
// CHECK-NEXT: 1: 2
// CHECK-NEXT: 2: int j = 2;
+// CHECK-NEXT: 3: DoStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B6
// CHECK-NEXT: Succs (1): B3
@@ -276,6 +299,7 @@
// CHECK: [B7]
// CHECK-NEXT: 1: 1
// CHECK-NEXT: 2: int j = 1;
+// CHECK-NEXT: 3: ForStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B6
@@ -292,6 +316,7 @@
// CHECK-NEXT: 1: 40
// CHECK-NEXT: 2: -[B9.1]
// CHECK-NEXT: 3: int i = -40;
+// CHECK-NEXT: 4: WhileStmt (LoopEntrance)
// CHECK-NEXT: Preds (1): B10
// CHECK-NEXT: Succs (1): B8
@@ -305,19 +330,19 @@
}
}
-// CHECK: [B9 (ENTRY)]
-// CHECK-NEXT: Succs (1): B8
+// CHECK: [B10 (ENTRY)]
+// CHECK-NEXT: Succs (1): B9
// CHECK: [B1]
// CHECK-NEXT: 1: ForStmt (LoopExit)
-// CHECK-NEXT: Preds (1): B7
+// CHECK-NEXT: Preds (1): B8
// CHECK-NEXT: Succs (1): B0
// CHECK: [B2]
// CHECK-NEXT: 1: j
// CHECK-NEXT: 2: [B2.1]++
// CHECK-NEXT: Preds (1): B3
-// CHECK-NEXT: Succs (1): B7
+// CHECK-NEXT: Succs (1): B8
// CHECK: [B3]
// CHECK-NEXT: 1: DoStmt (LoopExit)
@@ -346,22 +371,28 @@
// CHECK-NEXT: Succs (1): B5
// CHECK: [B7]
+// CHECK-NEXT: 1: DoStmt (LoopEntrance)
+// CHECK-NEXT: Preds (1): B8
+// CHECK-NEXT: Succs (1): B5
+
+// CHECK: [B8]
// CHECK-NEXT: 1: j
-// CHECK-NEXT: 2: [B7.1] (ImplicitCastExpr, LValueToRValue, int)
+// CHECK-NEXT: 2: [B8.1] (ImplicitCastExpr, LValueToRValue, int)
// CHECK-NEXT: 3: 6
-// CHECK-NEXT: 4: [B7.2] < [B7.3]
-// CHECK-NEXT: T: for (...; [B7.4]; ...)
-// CHECK-NEXT: Preds (2): B2 B8
-// CHECK-NEXT: Succs (2): B5 B1
+// CHECK-NEXT: 4: [B8.2] < [B8.3]
+//
