@@ -1192,8 +1192,8 @@ private predicate loadStep(
11921192 */
11931193pragma [ nomagic]
11941194private predicate reachableFromStoreBase (
1195- string startProp , string endProp , DataFlow:: Node base , DataFlow:: Node nd , DataFlow :: Configuration cfg ,
1196- PathSummary summary
1195+ string startProp , string endProp , DataFlow:: Node base , DataFlow:: Node nd ,
1196+ DataFlow :: Configuration cfg , PathSummary summary
11971197) {
11981198 exists ( PathSummary s1 , PathSummary s2 , DataFlow:: Node rhs |
11991199 reachableFromSource ( rhs , cfg , s1 )
@@ -1204,7 +1204,8 @@ private predicate reachableFromStoreBase(
12041204 endProp = startProp and
12051205 base = nd and
12061206 summary =
1207- MkPathSummary ( false , s1 .hasCall ( ) .booleanOr ( s2 .hasCall ( ) ) , DataFlow:: FlowLabel:: data ( ) , DataFlow:: FlowLabel:: data ( ) )
1207+ MkPathSummary ( false , s1 .hasCall ( ) .booleanOr ( s2 .hasCall ( ) ) , DataFlow:: FlowLabel:: data ( ) ,
1208+ DataFlow:: FlowLabel:: data ( ) )
12081209 )
12091210 or
12101211 exists ( PathSummary newSummary , PathSummary oldSummary |
@@ -1221,8 +1222,8 @@ private predicate reachableFromStoreBase(
12211222 */
12221223pragma [ noinline]
12231224private predicate reachableFromStoreBaseStep (
1224- string startProp , string endProp , DataFlow:: Node base , DataFlow:: Node nd , DataFlow :: Configuration cfg ,
1225- PathSummary oldSummary , PathSummary newSummary
1225+ string startProp , string endProp , DataFlow:: Node base , DataFlow:: Node nd ,
1226+ DataFlow :: Configuration cfg , PathSummary oldSummary , PathSummary newSummary
12261227) {
12271228 exists ( DataFlow:: Node mid |
12281229 reachableFromStoreBase ( startProp , endProp , base , mid , cfg , oldSummary ) and
@@ -1264,7 +1265,10 @@ private predicate storeToLoad(
12641265 DataFlow:: Node pred , DataFlow:: Node succ , DataFlow:: Configuration cfg , PathSummary oldSummary ,
12651266 PathSummary newSummary
12661267) {
1267- exists ( string storeProp , string loadProp , DataFlow:: Node storeBase , DataFlow:: Node loadBase , PathSummary s1 , PathSummary s2 |
1268+ exists (
1269+ string storeProp , string loadProp , DataFlow:: Node storeBase , DataFlow:: Node loadBase ,
1270+ PathSummary s1 , PathSummary s2
1271+ |
12681272 storeStep ( pred , storeBase , storeProp , cfg , s1 ) and
12691273 reachableFromStoreBase ( storeProp , loadProp , storeBase , loadBase , cfg , s2 ) and
12701274 oldSummary = s1 .appendValuePreserving ( s2 ) and
0 commit comments