C++: Fix conflated-memory sanity query

I had included `InitializeNonLocal` in the recursion because it made
everything look better in the presence of a bug that's since been fixed.
Taking it out means the sanity test is again aligned with the old
`isChiForAllAliasedMemory`.

Author: jbj

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

@@ -280,8 +280,6 @@ module InstructionSanity {
   private predicate isOnAliasedDefinitionChain(Instruction instr) {
     instr instanceof AliasedDefinitionInstruction
     or
-    instr.getOpcode() instanceof Opcode::InitializeNonLocal
-    or
     isOnAliasedDefinitionChain(instr.(ChiInstruction).getTotal())
     or
     isOnAliasedDefinitionChain(instr.(PhiInstruction).getAnInputOperand().getAnyDef())
@@ -291,6 +289,8 @@ module InstructionSanity {
     isOnAliasedDefinitionChain(instr)
     or
     instr instanceof UnmodeledDefinitionInstruction
+    or
+    instr.getOpcode() instanceof Opcode::InitializeNonLocal
   }
 
   query predicate notMarkedAsConflated(Instruction instr) {

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

@@ -280,8 +280,6 @@ module InstructionSanity {
   private predicate isOnAliasedDefinitionChain(Instruction instr) {
     instr instanceof AliasedDefinitionInstruction
     or
-    instr.getOpcode() instanceof Opcode::InitializeNonLocal
-    or
     isOnAliasedDefinitionChain(instr.(ChiInstruction).getTotal())
     or
     isOnAliasedDefinitionChain(instr.(PhiInstruction).getAnInputOperand().getAnyDef())
@@ -291,6 +289,8 @@ module InstructionSanity {
     isOnAliasedDefinitionChain(instr)
     or
     instr instanceof UnmodeledDefinitionInstruction
+    or
+    instr.getOpcode() instanceof Opcode::InitializeNonLocal
   }
 
   query predicate notMarkedAsConflated(Instruction instr) {

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

@@ -280,8 +280,6 @@ module InstructionSanity {
   private predicate isOnAliasedDefinitionChain(Instruction instr) {
     instr instanceof AliasedDefinitionInstruction
     or
-    instr.getOpcode() instanceof Opcode::InitializeNonLocal
-    or
     isOnAliasedDefinitionChain(instr.(ChiInstruction).getTotal())
     or
     isOnAliasedDefinitionChain(instr.(PhiInstruction).getAnInputOperand().getAnyDef())
@@ -291,6 +289,8 @@ module InstructionSanity {
     isOnAliasedDefinitionChain(instr)
     or
     instr instanceof UnmodeledDefinitionInstruction
+    or
+    instr.getOpcode() instanceof Opcode::InitializeNonLocal
   }
 
   query predicate notMarkedAsConflated(Instruction instr) {

csharp/ql/src/semmle/code/csharp/ir/implementation/raw/IRSanity.qll

@@ -280,8 +280,6 @@ module InstructionSanity {
   private predicate isOnAliasedDefinitionChain(Instruction instr) {
     instr instanceof AliasedDefinitionInstruction
     or
-    instr.getOpcode() instanceof Opcode::InitializeNonLocal
-    or
     isOnAliasedDefinitionChain(instr.(ChiInstruction).getTotal())
     or
     isOnAliasedDefinitionChain(instr.(PhiInstruction).getAnInputOperand().getAnyDef())
@@ -291,6 +289,8 @@ module InstructionSanity {
     isOnAliasedDefinitionChain(instr)
     or
     instr instanceof UnmodeledDefinitionInstruction
+    or
+    instr.getOpcode() instanceof Opcode::InitializeNonLocal
   }
 
   query predicate notMarkedAsConflated(Instruction instr) {

csharp/ql/src/semmle/code/csharp/ir/implementation/unaliased_ssa/IRSanity.qll

@@ -280,8 +280,6 @@ module InstructionSanity {
   private predicate isOnAliasedDefinitionChain(Instruction instr) {
     instr instanceof AliasedDefinitionInstruction
     or
-    instr.getOpcode() instanceof Opcode::InitializeNonLocal
-    or
     isOnAliasedDefinitionChain(instr.(ChiInstruction).getTotal())
     or
     isOnAliasedDefinitionChain(instr.(PhiInstruction).getAnInputOperand().getAnyDef())
@@ -291,6 +289,8 @@ module InstructionSanity {
     isOnAliasedDefinitionChain(instr)
     or
     instr instanceof UnmodeledDefinitionInstruction
+    or
+    instr.getOpcode() instanceof Opcode::InitializeNonLocal
   }
 
   query predicate notMarkedAsConflated(Instruction instr) {