C++: fix UseImpl after merge conflict

Robert Marsh · Robert Marsh · commit 6a91e859819c · 2023-01-26T16:01:37.000-05:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
@@ -339,6 +339,10 @@ abstract private class OperandBasedUse extends UseImpl {
     operand.getUse() = block.getInstruction(index)
   }
 
+  final Operand getOperand() {
+    result = operand
+  }
+
   final override Cpp::Location getLocation() { result = operand.getLocation() }
 }
 
@@ -538,7 +542,7 @@ private predicate globalDefToUse(GlobalDef globalDef, UseOrPhi useOrPhi) {
 }
 
 private predicate useToNode(UseOrPhi use, Node nodeTo) {
-  exists(UseImpl useImpl |
+  exists(OperandBasedUse useImpl |
     useImpl = use.asDefOrUse() and
     nodeHasOperand(nodeTo, useImpl.getOperand(), useImpl.getIndirectionIndex())
   )

Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,10 @@ abstract private class OperandBasedUse extends UseImpl {`
`339`	`339`	`operand.getUse() = block.getInstruction(index)`
`340`	`340`	`}`
`341`	`341`
	`342`	`+ final Operand getOperand() {`
	`343`	`+ result = operand`
	`344`	`+ }`
	`345`	`+`
`342`	`346`	`final override Cpp::Location getLocation() { result = operand.getLocation() }`
`343`	`347`	`}`
`344`	`348`
`@@ -538,7 +542,7 @@ private predicate globalDefToUse(GlobalDef globalDef, UseOrPhi useOrPhi) {`
`538`	`542`	`}`
`539`	`543`
`540`	`544`	`private predicate useToNode(UseOrPhi use, Node nodeTo) {`
`541`		`- exists(UseImpl useImpl \|`
	`545`	`+ exists(OperandBasedUse useImpl \|`
`542`	`546`	`useImpl = use.asDefOrUse() and`
`543`	`547`	`nodeHasOperand(nodeTo, useImpl.getOperand(), useImpl.getIndirectionIndex())`
`544`	`548`	`)`