Merge pull request #970 from jbj/ir-block-count

dave-bartolomeo · web-flow · commit 70bccf85fcb3 · 2019-02-22T10:19:39.000-08:00
C++: Use the cached getInstructionCount
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
@@ -60,7 +60,7 @@ class IRBlockBase extends TIRBlock {
   }
 
   final int getInstructionCount() {
-    result = strictcount(getInstruction(_))
+    result = getInstructionCount(this)
   }
 
   final FunctionIR getEnclosingFunctionIR() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
@@ -60,7 +60,7 @@ class IRBlockBase extends TIRBlock {
   }
 
   final int getInstructionCount() {
-    result = strictcount(getInstruction(_))
+    result = getInstructionCount(this)
   }
 
   final FunctionIR getEnclosingFunctionIR() {
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
@@ -60,7 +60,7 @@ class IRBlockBase extends TIRBlock {
   }
 
   final int getInstructionCount() {
-    result = strictcount(getInstruction(_))
+    result = getInstructionCount(this)
   }
 
   final FunctionIR getEnclosingFunctionIR() {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class IRBlockBase extends TIRBlock {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`final int getInstructionCount() {`
`63`		`- result = strictcount(getInstruction(_))`
	`63`	`+ result = getInstructionCount(this)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`final FunctionIR getEnclosingFunctionIR() {`