C++: filter operands of removed IR instructions

Author: rdmarsh2

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll

@@ -27,13 +27,12 @@ private class TStageOperand =
 class Operand extends TStageOperand {
   Operand() {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
-    this = registerOperand(_, _, _)
-    or
-    this = nonSSAMemoryOperand(_, _)
-    or
-    this = phiOperand(_, _, _, _)
-    or
-    this = chiOperand(_, _)
+    exists(Instruction use, Instruction def | this = registerOperand(use, _, def)) or
+    exists(Instruction use | this = nonSSAMemoryOperand(use, _)) or
+    exists(Instruction use, Instruction def, IRBlock predecessorBlock |
+      this = phiOperand(use, def, predecessorBlock, _)
+    ) or
+    exists(Instruction use | this = chiOperand(use, _))
   }
 
   /** Gets a textual representation of this element. */

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll

@@ -27,13 +27,12 @@ private class TStageOperand =
 class Operand extends TStageOperand {
   Operand() {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
-    this = registerOperand(_, _, _)
-    or
-    this = nonSSAMemoryOperand(_, _)
-    or
-    this = phiOperand(_, _, _, _)
-    or
-    this = chiOperand(_, _)
+    exists(Instruction use, Instruction def | this = registerOperand(use, _, def)) or
+    exists(Instruction use | this = nonSSAMemoryOperand(use, _)) or
+    exists(Instruction use, Instruction def, IRBlock predecessorBlock |
+      this = phiOperand(use, def, predecessorBlock, _)
+    ) or
+    exists(Instruction use | this = chiOperand(use, _))
   }
 
   /** Gets a textual representation of this element. */

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll

@@ -27,13 +27,12 @@ private class TStageOperand =
 class Operand extends TStageOperand {
   Operand() {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
-    this = registerOperand(_, _, _)
-    or
-    this = nonSSAMemoryOperand(_, _)
-    or
-    this = phiOperand(_, _, _, _)
-    or
-    this = chiOperand(_, _)
+    exists(Instruction use, Instruction def | this = registerOperand(use, _, def)) or
+    exists(Instruction use | this = nonSSAMemoryOperand(use, _)) or
+    exists(Instruction use, Instruction def, IRBlock predecessorBlock |
+      this = phiOperand(use, def, predecessorBlock, _)
+    ) or
+    exists(Instruction use | this = chiOperand(use, _))
   }
 
   /** Gets a textual representation of this element. */

csharp/ql/src/experimental/ir/implementation/raw/Operand.qll

@@ -27,13 +27,12 @@ private class TStageOperand =
 class Operand extends TStageOperand {
   Operand() {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
-    this = registerOperand(_, _, _)
-    or
-    this = nonSSAMemoryOperand(_, _)
-    or
-    this = phiOperand(_, _, _, _)
-    or
-    this = chiOperand(_, _)
+    exists(Instruction use, Instruction def | this = registerOperand(use, _, def)) or
+    exists(Instruction use | this = nonSSAMemoryOperand(use, _)) or
+    exists(Instruction use, Instruction def, IRBlock predecessorBlock |
+      this = phiOperand(use, def, predecessorBlock, _)
+    ) or
+    exists(Instruction use | this = chiOperand(use, _))
   }
 
   /** Gets a textual representation of this element. */

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/Operand.qll

@@ -27,13 +27,12 @@ private class TStageOperand =
 class Operand extends TStageOperand {
   Operand() {
     // Ensure that the operand does not refer to instructions from earlier stages that are unreachable here
-    this = registerOperand(_, _, _)
-    or
-    this = nonSSAMemoryOperand(_, _)
-    or
-    this = phiOperand(_, _, _, _)
-    or
-    this = chiOperand(_, _)
+    exists(Instruction use, Instruction def | this = registerOperand(use, _, def)) or
+    exists(Instruction use | this = nonSSAMemoryOperand(use, _)) or
+    exists(Instruction use, Instruction def, IRBlock predecessorBlock |
+      this = phiOperand(use, def, predecessorBlock, _)
+    ) or
+    exists(Instruction use | this = chiOperand(use, _))
   }
 
   /** Gets a textual representation of this element. */