Dataflow: A few variable renamings.

aschackmull · aschackmull · commit 628e0a795aac · 2020-11-13T15:09:28.000+01:00
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -825,9 +825,9 @@ private module Stage2 {
         fwdFlowOut(call, node, cc, argAp, ap, config) and
         cc = false
         or
-        exists(boolean argStored0 |
-          fwdFlowOutFromArg(call, node, argStored0, ap, config) and
-          fwdFlowIsEntered(call, cc, argAp, argStored0, config)
+        exists(Ap argAp0 |
+          fwdFlowOutFromArg(call, node, argAp0, ap, config) and
+          fwdFlowIsEntered(call, cc, argAp, argAp0, config)
         )
       )
     )
@@ -868,21 +868,21 @@ private module Stage2 {
 
   pragma[nomagic]
   private predicate fwdFlowOut(
-    DataFlowCall call, Node out, Cc cc, ApOption argAp, Ap ap, Configuration config
+    DataFlowCall call, Node node, Cc cc, ApOption argAp, Ap ap, Configuration config
   ) {
     exists(ReturnNodeExt ret, boolean allowsFieldFlow |
       fwdFlow(ret, cc, argAp, ap, config) and
-      flowOutOfCallNodeCand1(call, ret, out, allowsFieldFlow, config)
+      flowOutOfCallNodeCand1(call, ret, node, allowsFieldFlow, config)
     |
       ap instanceof ApNil or allowsFieldFlow = true
     )
   }
 
   pragma[nomagic]
   private predicate fwdFlowOutFromArg(
-    DataFlowCall call, Node out, boolean argAp, Ap ap, Configuration config
+    DataFlowCall call, Node node, Ap argAp, Ap ap, Configuration config
   ) {
-    fwdFlowOut(call, out, true, apSome(argAp), ap, config)
+    fwdFlowOut(call, node, true, apSome(argAp), ap, config)
   }
 
   /**
@@ -1026,9 +1026,9 @@ private module Stage2 {
    */
   pragma[noinline]
   predicate revFlowIsReadAndStored(Content c, Configuration conf) {
-    exists(boolean apNonEmpty |
-      revFlowIsStored(c, apNonEmpty, conf) and
-      revFlowConsCand(c, apNonEmpty, conf)
+    exists(Ap ap |
+      revFlowIsStored(c, ap, conf) and
+      revFlowConsCand(c, ap, conf)
     )
   }
 
@@ -1332,9 +1332,9 @@ private module Stage3 {
       fwdFlowOut(call, node, cc, argAp, ap, config) and
       cc = false
       or
-      exists(Ap argApf0 |
-        fwdFlowOutFromArg(call, node, argApf0, ap, config) and
-        fwdFlowIsEntered(call, cc, argAp, argApf0, config)
+      exists(Ap argAp0 |
+        fwdFlowOutFromArg(call, node, argAp0, ap, config) and
+        fwdFlowIsEntered(call, cc, argAp, argAp0, config)
       )
     )
   }
@@ -2066,9 +2066,9 @@ private module Stage4 {
       revFlowIn(call, node, toReturn, returnAp, ap, config) and
       toReturn = false
       or
-      exists(Ap returnApa0 |
-        revFlowInToReturn(call, node, returnApa0, ap, config) and
-        revFlowIsReturned(call, toReturn, returnAp, returnApa0, config)
+      exists(Ap returnAp0 |
+        revFlowInToReturn(call, node, returnAp0, ap, config) and
+        revFlowIsReturned(call, toReturn, returnAp, returnAp0, config)
       )
     )
     or

Original file line number	Diff line number	Diff line change
`@@ -825,9 +825,9 @@ private module Stage2 {`
`825`	`825`	`fwdFlowOut(call, node, cc, argAp, ap, config) and`
`826`	`826`	`cc = false`
`827`	`827`	`or`
`828`		`- exists(boolean argStored0 \|`
`829`		`- fwdFlowOutFromArg(call, node, argStored0, ap, config) and`
`830`		`- fwdFlowIsEntered(call, cc, argAp, argStored0, config)`
	`828`	`+ exists(Ap argAp0 \|`
	`829`	`+ fwdFlowOutFromArg(call, node, argAp0, ap, config) and`
	`830`	`+ fwdFlowIsEntered(call, cc, argAp, argAp0, config)`
`831`	`831`	`)`
`832`	`832`	`)`
`833`	`833`	`)`
`@@ -868,21 +868,21 @@ private module Stage2 {`
`868`	`868`
`869`	`869`	`pragma[nomagic]`
`870`	`870`	`private predicate fwdFlowOut(`
`871`		`- DataFlowCall call, Node out, Cc cc, ApOption argAp, Ap ap, Configuration config`
	`871`	`+ DataFlowCall call, Node node, Cc cc, ApOption argAp, Ap ap, Configuration config`
`872`	`872`	`) {`
`873`	`873`	`exists(ReturnNodeExt ret, boolean allowsFieldFlow \|`
`874`	`874`	`fwdFlow(ret, cc, argAp, ap, config) and`
`875`		`- flowOutOfCallNodeCand1(call, ret, out, allowsFieldFlow, config)`
	`875`	`+ flowOutOfCallNodeCand1(call, ret, node, allowsFieldFlow, config)`
`876`	`876`	`\|`
`877`	`877`	`ap instanceof ApNil or allowsFieldFlow = true`
`878`	`878`	`)`
`879`	`879`	`}`
`880`	`880`
`881`	`881`	`pragma[nomagic]`
`882`	`882`	`private predicate fwdFlowOutFromArg(`
`883`		`- DataFlowCall call, Node out, boolean argAp, Ap ap, Configuration config`
	`883`	`+ DataFlowCall call, Node node, Ap argAp, Ap ap, Configuration config`
`884`	`884`	`) {`
`885`		`- fwdFlowOut(call, out, true, apSome(argAp), ap, config)`
	`885`	`+ fwdFlowOut(call, node, true, apSome(argAp), ap, config)`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`/**`
`@@ -1026,9 +1026,9 @@ private module Stage2 {`
`1026`	`1026`	`*/`
`1027`	`1027`	`pragma[noinline]`
`1028`	`1028`	`predicate revFlowIsReadAndStored(Content c, Configuration conf) {`
`1029`		`- exists(boolean apNonEmpty \|`
`1030`		`- revFlowIsStored(c, apNonEmpty, conf) and`
`1031`		`- revFlowConsCand(c, apNonEmpty, conf)`
	`1029`	`+ exists(Ap ap \|`
	`1030`	`+ revFlowIsStored(c, ap, conf) and`
	`1031`	`+ revFlowConsCand(c, ap, conf)`
`1032`	`1032`	`)`
`1033`	`1033`	`}`
`1034`	`1034`
`@@ -1332,9 +1332,9 @@ private module Stage3 {`
`1332`	`1332`	`fwdFlowOut(call, node, cc, argAp, ap, config) and`
`1333`	`1333`	`cc = false`
`1334`	`1334`	`or`
`1335`		`- exists(Ap argApf0 \|`
`1336`		`- fwdFlowOutFromArg(call, node, argApf0, ap, config) and`
`1337`		`- fwdFlowIsEntered(call, cc, argAp, argApf0, config)`
	`1335`	`+ exists(Ap argAp0 \|`
	`1336`	`+ fwdFlowOutFromArg(call, node, argAp0, ap, config) and`
	`1337`	`+ fwdFlowIsEntered(call, cc, argAp, argAp0, config)`
`1338`	`1338`	`)`
`1339`	`1339`	`)`
`1340`	`1340`	`}`
`@@ -2066,9 +2066,9 @@ private module Stage4 {`
`2066`	`2066`	`revFlowIn(call, node, toReturn, returnAp, ap, config) and`
`2067`	`2067`	`toReturn = false`
`2068`	`2068`	`or`
`2069`		`- exists(Ap returnApa0 \|`
`2070`		`- revFlowInToReturn(call, node, returnApa0, ap, config) and`
`2071`		`- revFlowIsReturned(call, toReturn, returnAp, returnApa0, config)`
	`2069`	`+ exists(Ap returnAp0 \|`
	`2070`	`+ revFlowInToReturn(call, node, returnAp0, ap, config) and`
	`2071`	`+ revFlowIsReturned(call, toReturn, returnAp, returnAp0, config)`
`2072`	`2072`	`)`
`2073`	`2073`	`)`
`2074`	`2074`	`or`