Merge pull request #178 from jbj/ir-duplicateOperand-perf

ian-semmle · web-flow · commit 628d7b95d97e · 2018-09-11T12:53:27.000+01:00
C++: IR: InstructionSanity::duplicateOperand perf
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll
@@ -63,7 +63,7 @@ module InstructionSanity {
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
   query predicate duplicateOperand(Instruction instr, OperandTag tag) {
-    count(instr.getOperand(tag)) > 1 and
+    strictcount(instr.getOperand(tag)) > 1 and
     not tag instanceof UnmodeledUseOperand
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll
@@ -63,7 +63,7 @@ module InstructionSanity {
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
   query predicate duplicateOperand(Instruction instr, OperandTag tag) {
-    count(instr.getOperand(tag)) > 1 and
+    strictcount(instr.getOperand(tag)) > 1 and
     not tag instanceof UnmodeledUseOperand
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll
@@ -63,7 +63,7 @@ module InstructionSanity {
    * Holds if instruction `instr` has multiple operands with tag `tag`.
    */
   query predicate duplicateOperand(Instruction instr, OperandTag tag) {
-    count(instr.getOperand(tag)) > 1 and
+    strictcount(instr.getOperand(tag)) > 1 and
     not tag instanceof UnmodeledUseOperand
   }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ module InstructionSanity {`
`63`	`63`	* Holds if instruction `instr` has multiple operands with tag `tag`.
`64`	`64`	`*/`
`65`	`65`	`query predicate duplicateOperand(Instruction instr, OperandTag tag) {`
`66`		`- count(instr.getOperand(tag)) > 1 and`
	`66`	`+ strictcount(instr.getOperand(tag)) > 1 and`
`67`	`67`	`not tag instanceof UnmodeledUseOperand`
`68`	`68`	`}`
`69`	`69`