Merge pull request #4292 from MathiasVP/mathiasvp/cache-simpleLocalFlowStep

MathiasVP · web-flow · commit 8c615ece8a4d · 2020-09-18T10:18:21.000+02:00
C++: Cache simpleLocalFlowStep instead of simpleInstructionLocalFlowStep
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -545,6 +545,7 @@ predicate localFlowStep(Node nodeFrom, Node nodeTo) { simpleLocalFlowStep(nodeFr
  * This is the local flow predicate that's used as a building block in global
  * data flow. It may have less flow than the `localFlowStep` predicate.
  */
+cached
 predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {
   // Operand -> Instruction flow
   simpleInstructionLocalFlowStep(nodeFrom.asOperand(), nodeTo.asInstruction())
@@ -606,7 +607,6 @@ private predicate simpleOperandLocalFlowStep(Instruction iFrom, Operand opTo) {
   )
 }
 
-cached
 private predicate simpleInstructionLocalFlowStep(Operand opFrom, Instruction iTo) {
   iTo.(CopyInstruction).getSourceValueOperand() = opFrom
   or

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,7 @@ predicate localFlowStep(Node nodeFrom, Node nodeTo) { simpleLocalFlowStep(nodeFr`
`545`	`545`	`* This is the local flow predicate that's used as a building block in global`
`546`	`546`	* data flow. It may have less flow than the `localFlowStep` predicate.
`547`	`547`	`*/`
	`548`	`+cached`
`548`	`549`	`predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo) {`
`549`	`550`	`// Operand -> Instruction flow`
`550`	`551`	`simpleInstructionLocalFlowStep(nodeFrom.asOperand(), nodeTo.asInstruction())`
`@@ -606,7 +607,6 @@ private predicate simpleOperandLocalFlowStep(Instruction iFrom, Operand opTo) {`
`606`	`607`	`)`
`607`	`608`	`}`
`608`	`609`
`609`		`-cached`
`610`	`610`	`private predicate simpleInstructionLocalFlowStep(Operand opFrom, Instruction iTo) {`
`611`	`611`	`iTo.(CopyInstruction).getSourceValueOperand() = opFrom`
`612`	`612`	`or`