C++/C#: Stop caching getOldInstruction()

Author: Dave Bartolomeo

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

@@ -64,9 +64,6 @@ private module Cached {
     result.getFirstInstruction() = getNewInstruction(oldBlock.getFirstInstruction())
   }
 
-  cached
-  OldInstruction getOldInstruction(Instruction instr) { instr = result }
-
   cached
   predicate hasModeledMemoryResult(Instruction instruction) {
     exists(Alias::getResultMemoryLocation(getOldInstruction(instruction))) or
@@ -341,6 +338,8 @@ private module Cached {
 
 private Instruction getNewInstruction(OldInstruction instr) { getOldInstruction(result) = instr }
 
+private OldInstruction getOldInstruction(Instruction instr) { instr = result }
+
 private ChiInstruction getChi(OldInstruction primaryInstr) {
   result = chiInstruction(_, primaryInstr)
 }

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -64,9 +64,6 @@ private module Cached {
     result.getFirstInstruction() = getNewInstruction(oldBlock.getFirstInstruction())
   }
 
-  cached
-  OldInstruction getOldInstruction(Instruction instr) { instr = result }
-
   cached
   predicate hasModeledMemoryResult(Instruction instruction) {
     exists(Alias::getResultMemoryLocation(getOldInstruction(instruction))) or
@@ -341,6 +338,8 @@ private module Cached {
 
 private Instruction getNewInstruction(OldInstruction instr) { getOldInstruction(result) = instr }
 
+private OldInstruction getOldInstruction(Instruction instr) { instr = result }
+
 private ChiInstruction getChi(OldInstruction primaryInstr) {
   result = chiInstruction(_, primaryInstr)
 }

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

@@ -64,9 +64,6 @@ private module Cached {
     result.getFirstInstruction() = getNewInstruction(oldBlock.getFirstInstruction())
   }
 
-  cached
-  OldInstruction getOldInstruction(Instruction instr) { instr = result }
-
   cached
   predicate hasModeledMemoryResult(Instruction instruction) {
     exists(Alias::getResultMemoryLocation(getOldInstruction(instruction))) or
@@ -341,6 +338,8 @@ private module Cached {
 
 private Instruction getNewInstruction(OldInstruction instr) { getOldInstruction(result) = instr }
 
+private OldInstruction getOldInstruction(Instruction instr) { instr = result }
+
 private ChiInstruction getChi(OldInstruction primaryInstr) {
   result = chiInstruction(_, primaryInstr)
 }