C++ IR: getAnyDef -> getDef in ValueNumbering

jbj · jbj · commit a16ed7d61352 · 2019-07-03T11:05:06.000+02:00
This change seems more in line with what users would expect.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll
@@ -86,9 +86,12 @@ class ValueNumber extends TValueNumber {
       instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
     )
   }
-  
+
+  /**
+   * Gets an `Operand` whose definition is exact and has this value number.
+   */
   final Operand getAUse() {
-    this = valueNumber(result.getAnyDef())
+    this = valueNumber(result.getDef())
   }
 }
 
@@ -227,10 +230,11 @@ cached ValueNumber valueNumber(Instruction instr) {
 }
 
 /**
- * Gets the value number assigned to `instr`, if any. Returns at most one result.
+ * Gets the value number assigned to the exact definition of `op`, if any.
+ * Returns at most one result.
  */
 ValueNumber valueNumberOfOperand(Operand op) {
-  result = valueNumber(op.getAnyDef())
+  result = valueNumber(op.getDef())
 }
 
 /**
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll
@@ -86,9 +86,12 @@ class ValueNumber extends TValueNumber {
       instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
     )
   }
-  
+
+  /**
+   * Gets an `Operand` whose definition is exact and has this value number.
+   */
   final Operand getAUse() {
-    this = valueNumber(result.getAnyDef())
+    this = valueNumber(result.getDef())
   }
 }
 
@@ -227,10 +230,11 @@ cached ValueNumber valueNumber(Instruction instr) {
 }
 
 /**
- * Gets the value number assigned to `instr`, if any. Returns at most one result.
+ * Gets the value number assigned to the exact definition of `op`, if any.
+ * Returns at most one result.
  */
 ValueNumber valueNumberOfOperand(Operand op) {
-  result = valueNumber(op.getAnyDef())
+  result = valueNumber(op.getDef())
 }
 
 /**
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/ValueNumbering.qll
@@ -86,9 +86,12 @@ class ValueNumber extends TValueNumber {
       instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()
     )
   }
-  
+
+  /**
+   * Gets an `Operand` whose definition is exact and has this value number.
+   */
   final Operand getAUse() {
-    this = valueNumber(result.getAnyDef())
+    this = valueNumber(result.getDef())
   }
 }
 
@@ -227,10 +230,11 @@ cached ValueNumber valueNumber(Instruction instr) {
 }
 
 /**
- * Gets the value number assigned to `instr`, if any. Returns at most one result.
+ * Gets the value number assigned to the exact definition of `op`, if any.
+ * Returns at most one result.
  */
 ValueNumber valueNumberOfOperand(Operand op) {
-  result = valueNumber(op.getAnyDef())
+  result = valueNumber(op.getDef())
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,12 @@ class ValueNumber extends TValueNumber {`
`86`	`86`	`instr order by instr.getBlock().getDisplayIndex(), instr.getDisplayIndexInBlock()`
`87`	`87`	`)`
`88`	`88`	`}`
`89`		`-`
	`89`	`+`
	`90`	`+ /**`
	`91`	+ * Gets an `Operand` whose definition is exact and has this value number.
	`92`	`+ */`
`90`	`93`	`final Operand getAUse() {`
`91`		`- this = valueNumber(result.getAnyDef())`
	`94`	`+ this = valueNumber(result.getDef())`
`92`	`95`	`}`
`93`	`96`	`}`
`94`	`97`
`@@ -227,10 +230,11 @@ cached ValueNumber valueNumber(Instruction instr) {`
`227`	`230`	`}`
`228`	`231`
`229`	`232`	`/**`
`230`		- * Gets the value number assigned to `instr`, if any. Returns at most one result.
	`233`	+ * Gets the value number assigned to the exact definition of `op`, if any.
	`234`	`+ * Returns at most one result.`
`231`	`235`	`*/`
`232`	`236`	`ValueNumber valueNumberOfOperand(Operand op) {`
`233`		`- result = valueNumber(op.getAnyDef())`
	`237`	`+ result = valueNumber(op.getDef())`
`234`	`238`	`}`
`235`	`239`
`236`	`240`	`/**`