C++/C#: add NonPhiMemoryOperand union type

This fixes a performance issue where the whole MemoryOperand table was
scanned in some predicates that used only NonPhiMemoryOperand

Author: Robert Marsh

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

@@ -272,7 +272,7 @@ class RegisterOperand extends NonPhiOperand, TRegisterOperand {
 /**
  * A memory operand other than the operand of a `Phi` instruction.
  */
-class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand {
+class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOperand {
   override MemoryOperandTag tag;
 
   NonPhiMemoryOperand() {

cpp/ql/src/semmle/code/cpp/ir/implementation/internal/TOperand.qll

@@ -100,6 +100,8 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
+  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+
   /**
    * Returns the Phi operand with the specified parameters.
    */
@@ -129,6 +131,7 @@ module UnaliasedSSAOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
+  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
   /**
    * Returns the Phi operand with the specified parameters.
    */
@@ -158,6 +161,7 @@ module AliasedSSAOperands {
 
   class TChiOperand = Internal::TAliasedChiOperand;
 
+  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
   /**
    * Returns the Phi operand with the specified parameters.
    */

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

@@ -272,7 +272,7 @@ class RegisterOperand extends NonPhiOperand, TRegisterOperand {
 /**
  * A memory operand other than the operand of a `Phi` instruction.
  */
-class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand {
+class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOperand {
   override MemoryOperandTag tag;
 
   NonPhiMemoryOperand() {

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

@@ -272,7 +272,7 @@ class RegisterOperand extends NonPhiOperand, TRegisterOperand {
 /**
  * A memory operand other than the operand of a `Phi` instruction.
  */
-class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand {
+class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOperand {
   override MemoryOperandTag tag;
 
   NonPhiMemoryOperand() {

csharp/ql/src/experimental/ir/implementation/internal/TOperand.qll

@@ -80,6 +80,7 @@ module RawOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
+  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
   /**
    * Returns the Phi operand with the specified parameters.
    */
@@ -109,6 +110,8 @@ module UnaliasedSSAOperands {
 
   class TChiOperand = Internal::TNoOperand;
 
+  class TNonPhiMemoryOperand = TNonSSAMemoryOperand or TChiOperand;
+
   /**
    * Returns the Phi operand with the specified parameters.
    */

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

@@ -272,7 +272,7 @@ class RegisterOperand extends NonPhiOperand, TRegisterOperand {
 /**
  * A memory operand other than the operand of a `Phi` instruction.
  */
-class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand {
+class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOperand {
   override MemoryOperandTag tag;
 
   NonPhiMemoryOperand() {

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

@@ -272,7 +272,7 @@ class RegisterOperand extends NonPhiOperand, TRegisterOperand {
 /**
  * A memory operand other than the operand of a `Phi` instruction.
  */
-class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand {
+class NonPhiMemoryOperand extends NonPhiOperand, MemoryOperand, TNonPhiMemoryOperand {
   override MemoryOperandTag tag;
 
   NonPhiMemoryOperand() {