C++: Fix range analysis for new API

dave-bartolomeo · dave-bartolomeo · commit f5121d71bc48 · 2019-02-12T09:38:11.000-08:00
diff --git a/cpp/ql/src/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll b/cpp/ql/src/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
@@ -379,7 +379,7 @@ private predicate boundedNonPhiOperand(NonPhiOperand op, Bound b, int delta, boo
 private predicate boundFlowStepPhi(
   PhiOperand op2, Operand op1, int delta, boolean upper, Reason reason
 ) {
-  op2.getDefinitionInstruction().getAnOperand().(CopySourceOperand) = op1 and
+  op2.getDefinitionInstruction().(CopyInstruction).getSourceValueOperand() = op1 and
   (upper = true or upper = false) and
   reason = TNoReason() and
   delta = 0
diff --git a/cpp/ql/src/semmle/code/cpp/rangeanalysis/RangeUtils.qll b/cpp/ql/src/semmle/code/cpp/rangeanalysis/RangeUtils.qll
@@ -28,7 +28,7 @@ IntValue getConstantValue(Instruction instr) {
 }
 
 predicate valueFlowStep(Instruction i, Operand op, int delta) {
-  i.getAnOperand().(CopySourceOperand) = op and delta = 0
+  i.(CopyInstruction).getSourceValueOperand() = op and delta = 0
   or
   exists(Operand x |
     i.(AddInstruction).getAnOperand() = op and
diff --git a/cpp/ql/src/semmle/code/cpp/rangeanalysis/SignAnalysis.qll b/cpp/ql/src/semmle/code/cpp/rangeanalysis/SignAnalysis.qll
@@ -398,7 +398,7 @@ cached module SignAnalysisCached {
         result = castSign(operandSign(ci.getAnOperand()), fromSigned, toSigned, getCastKind(ci))
       )
       or
-      result = operandSign(i.getAnOperand().(CopySourceOperand))
+      result = operandSign(i.(CopyInstruction).getSourceValueOperand())
       or
       result = operandSign(i.(BitComplementInstruction).getAnOperand()).bitnot()
       or
diff --git a/cpp/ql/test/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.ql b/cpp/ql/test/library-tests/rangeanalysis/rangeanalysis/RangeAnalysis.ql
@@ -9,7 +9,9 @@ query predicate instructionBounds(Instruction i, Bound b, int delta, boolean upp
   (
     i.getAUse() instanceof ArgumentOperand
     or
-    i.getAUse() instanceof ReturnValueOperand
+    exists(ReturnValueInstruction retInstr |
+      retInstr.getReturnValueOperand() = i.getAUse()
+    )
   ) and
   (
     upper = true and

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ IntValue getConstantValue(Instruction instr) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`predicate valueFlowStep(Instruction i, Operand op, int delta) {`
`31`		`- i.getAnOperand().(CopySourceOperand) = op and delta = 0`
	`31`	`+ i.(CopyInstruction).getSourceValueOperand() = op and delta = 0`
`32`	`32`	`or`
`33`	`33`	`exists(Operand x \|`
`34`	`34`	`i.(AddInstruction).getAnOperand() = op and`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ cached module SignAnalysisCached {`
`398`	`398`	`result = castSign(operandSign(ci.getAnOperand()), fromSigned, toSigned, getCastKind(ci))`
`399`	`399`	`)`
`400`	`400`	`or`
`401`		`- result = operandSign(i.getAnOperand().(CopySourceOperand))`
	`401`	`+ result = operandSign(i.(CopyInstruction).getSourceValueOperand())`
`402`	`402`	`or`
`403`	`403`	`result = operandSign(i.(BitComplementInstruction).getAnOperand()).bitnot()`
`404`	`404`	`or`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ query predicate instructionBounds(Instruction i, Bound b, int delta, boolean upp`
`9`	`9`	`(`
`10`	`10`	`i.getAUse() instanceof ArgumentOperand`
`11`	`11`	`or`
`12`		`- i.getAUse() instanceof ReturnValueOperand`
	`12`	`+ exists(ReturnValueInstruction retInstr \|`
	`13`	`+ retInstr.getReturnValueOperand() = i.getAUse()`
	`14`	`+ )`
`13`	`15`	`) and`
`14`	`16`	`(`
`15`	`17`	`upper = true and`