@@ -1459,7 +1459,7 @@ module CFG {
1459
1459
// `defer` can be the first `defer` statement executed
1460
1460
// there is always a predecessor node because the `defer`'s call is always
1461
1461
// evaluated before the defer statement itself
1462
- MkDeferNode ( defer ) = succ0 ( notDefersucc0 * ( this .getEntry ( ) ) )
1462
+ MkDeferNode ( defer ) = succ0 ( notDeferSucc0 * ( this .getEntry ( ) ) )
1463
1463
)
1464
1464
}
1465
1465
@@ -1492,7 +1492,7 @@ module CFG {
1492
1492
exists ( Completion cmpl |
1493
1493
lastNode ( this .getBody ( ) , pred , cmpl ) and
1494
1494
// last node of function body can be reached without going through a `defer` statement
1495
- pred = notDefersucc0 * ( this .getEntry ( ) )
1495
+ pred = notDeferSucc0 * ( this .getEntry ( ) )
1496
1496
|
1497
1497
// panic goes directly to exit, non-panic reads result variables first
1498
1498
if cmpl = Panic ( ) then succ = MkExitNode ( this ) else succ = this .getEpilogueNode ( 0 )
@@ -1502,7 +1502,7 @@ module CFG {
1502
1502
exists ( DeferStmt defer | defer = this .getADeferStmt ( ) |
1503
1503
succ = MkExprNode ( defer .getCall ( ) ) and
1504
1504
// the last `DeferStmt` executed before pred is this `defer`
1505
- pred = notDefersucc0 * ( MkDeferNode ( defer ) )
1505
+ pred = notDeferSucc0 * ( MkDeferNode ( defer ) )
1506
1506
)
1507
1507
or
1508
1508
exists ( DeferStmt predDefer , DeferStmt succDefer |
@@ -2066,7 +2066,7 @@ module CFG {
2066
2066
}
2067
2067
2068
2068
/** Gets a successor of `nd` that is not a `defer` node */
2069
- private ControlFlow:: Node notDefersucc0 ( ControlFlow:: Node nd ) {
2069
+ private ControlFlow:: Node notDeferSucc0 ( ControlFlow:: Node nd ) {
2070
2070
not result = MkDeferNode ( _) and
2071
2071
result = succ0 ( nd )
2072
2072
}
@@ -2078,7 +2078,7 @@ module CFG {
2078
2078
(
2079
2079
result = succ0 ( nd )
2080
2080
or
2081
- result = succ0 ( notDefersucc0 + ( nd ) )
2081
+ result = succ0 ( notDeferSucc0 + ( nd ) )
2082
2082
)
2083
2083
}
2084
2084
0 commit comments